Changeset 1198 for code/branches/console/src/core/TclBind.cc

Timestamp:

Apr 27, 2008, 10:22:32 PM (16 years ago)

Author:

landauf

Message:

CommandExecutor uses Tcl

File:

• code/branches/console/src/core/TclBind.cc (modified) (5 diffs)

code/branches/console/src/core/TclBind.cc

@@ -71 +71 @@
             this->interpreter_ = new Tcl::interpreter(this->tclLibPath_);
             this->interpreter_->def("puts", TclBind::puts, Tcl::variadic());
+            this->interpreter_->def("orxonox", TclBind::orxonox, Tcl::variadic());
             this->interpreter_->def("execute", TclBind::execute, Tcl::variadic());
-            this->interpreter_->eval("proc unknown {args} { return [execute $args] }");
+            this->interpreter_->eval("proc unknown {args} { return [orxonox $args] }");
+            this->interpreter_->eval("rename exit tclexit; proc exit {} { orxonox exit }");
         }
     }
@@ -92 +94 @@
     }
 
-    std::string TclBind::execute(Tcl::object const &args)
+    std::string TclBind::orxonox(Tcl::object const &args)
     {
 std::cout << "Tcl_execute: args: " << args.get() << std::endl;
@@ -100 +102 @@
             command = command.substr(1, command.size() - 2);
 
-        if (!CommandExecutor::execute(command))
+        if (!CommandExecutor::execute(command, false))
             COUT(1) << "Error: Can't execute command \"" << command << "\"!" << std::endl;
 
@@ -107 +109 @@
 
         return "";
+    }
+
+    void TclBind::execute(Tcl::object const &args)
+    {
     }
 
@@ -129 +135 @@
         return "";
     }
+
+    bool TclBind::eval(const std::string& tclcode)
+    {
+        try
+        {
+            TclBind::getInstance().interpreter_->eval(tclcode);
+            return true;
+        }
+        catch (Tcl::tcl_error const &e)
+        {
+            COUT(1) << "Error: " << e.what() << std::endl;
+        }
+        catch (std::exception const &e)
+        {
+            COUT(1) << "Error while executing tcl: " << e.what() << std::endl;
+        }
+
+        return false;
+    }
 }