Changeset 5747 for code/trunk/src/libraries/core/TclBind.cc

Timestamp:

Sep 19, 2009, 11:17:51 PM (15 years ago)

Author:

rgrieder

Message:

Added Exception::handleMessage() (copy from Game::getExceptionMessage) function that returns the exception message (if retrievable) when catching with "…"
and adjusted some exception handlers.

File:

• code/trunk/src/libraries/core/TclBind.cc (modified) (5 diffs)

code/trunk/src/libraries/core/TclBind.cc

@@ -35 +35 @@
 #include "SpecialConfig.h"
 #include "util/Debug.h"
+#include "util/Exception.h"
 #include "util/StringUtils.h"
 #include "CommandExecutor.h"
@@ -92 +93 @@
             catch (Tcl::tcl_error const &e)
             {   COUT(1) << "Tcl error while creating Tcl-interpreter: " << e.what() << std::endl;   }
-            catch (std::exception const &e)
-            {   COUT(1) << "Error while creating Tcl-interpreter: " << e.what() << std::endl;   }
             catch (...)
-            {   COUT(1) << "Error while creating Tcl-interpreter." << std::endl;   }
+            {   COUT(1) << "Error while creating Tcl-interpreter: " << Exception::handleMessage() << std::endl;   }
         }
     }
@@ -115 +114 @@
         catch (Tcl::tcl_error const &e)
         {   COUT(1) << "Tcl error while creating Tcl-interpreter: " << e.what() << std::endl; COUT(1) << "Error: Tcl isn't properly initialized. Orxonox might possibly not work like that." << std::endl;   }
-        catch (std::exception const &e)
-        {   COUT(1) << "Error while creating Tcl-interpreter: " << e.what() << std::endl; COUT(1) << "Error: Tcl isn't properly initialized. Orxonox might possibly not work like that." << std::endl;   }
         catch (...)
-        {   COUT(1) << "Error while creating Tcl-interpreter." << std::endl; COUT(1) << "Error: Tcl isn't properly initialized. Orxonox might possibly not work like that." << std::endl;   }
+        {   COUT(1) << "Error while creating Tcl-interpreter: " << Exception::handleMessage() << std::endl; COUT(1) << "Error: Tcl isn't properly initialized. Orxonox might possibly not work like that." << std::endl;   }
 
         return interpreter;
@@ -178 +175 @@
             catch (Tcl::tcl_error const &e)
             {   COUT(1) << "tcl> Error: " << e.what() << std::endl;   }
-            catch (std::exception const &e)
-            {   COUT(1) << "Error while executing Tcl: " << e.what() << std::endl;   }
+            catch (...)
+            {   COUT(1) << "Error while executing Tcl: " << Exception::handleMessage() << std::endl;   }
         }
 
@@ -199 +196 @@
         catch (Tcl::tcl_error const &e)
         {   COUT(1) << "Tcl error: " << e.what() << std::endl;   }
-        catch (std::exception const &e)
-        {   COUT(1) << "Error while executing Tcl: " << e.what() << std::endl;   }
+        catch (...)
+        {   COUT(1) << "Error while executing Tcl: " << Exception::handleMessage() << std::endl;   }
 
         return false;