Changeset 1198 for code/branches/console

Timestamp:

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

Author:

landauf

Message:

CommandExecutor uses Tcl

Location:

code/branches/console/src/core

Files:

• CommandExecutor.cc (modified) (2 diffs)
• CommandExecutor.h (modified) (1 diff)
• CorePrereqs.h (modified) (1 diff)
• TclBind.cc (modified) (5 diffs)
• TclBind.h (modified) (2 diffs)

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

@@ -36 +36 @@
 #include "Executor.h"
 #include "ConfigValueContainer.h"
+#include "TclBind.h"
 
 #define COMMAND_EXECUTOR_KEYWORD_SET_CONFIG_VALUE "set"
@@ -379 +380 @@
     }
 
-    bool CommandExecutor::execute(const std::string& command)
-    {
-        if ((CommandExecutor::getEvaluation().processedCommand_ != command) || (CommandExecutor::getEvaluation().state_ == CS_Uninitialized))
-            CommandExecutor::parse(command);
-
-        return CommandExecutor::execute(CommandExecutor::getEvaluation());
+    bool CommandExecutor::execute(const std::string& command, bool useTcl)
+    {
+        if (useTcl)
+        {
+            return TclBind::eval(command);
+        }
+        else
+        {
+            if ((CommandExecutor::getEvaluation().processedCommand_ != command) || (CommandExecutor::getEvaluation().state_ == CS_Uninitialized))
+                CommandExecutor::parse(command);
+
+            return CommandExecutor::execute(CommandExecutor::getEvaluation());
+        }
     }
 

code/branches/console/src/core/CommandExecutor.h

@@ -131 +131 @@
     {
         public:
-            static bool execute(const std::string& command);
+            static bool execute(const std::string& command, bool useTcl = true);
             static bool execute(const CommandEvaluation& evaluation);
 

code/branches/console/src/core/CorePrereqs.h

@@ -139 +139 @@
   template <class T>
   class SubclassIdentifier;
+  class TclBind;
   class Tickable;
   template <class T, class O>

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;
+    }
 }

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

@@ -30 +30 @@
 #define _TclBind_H__
 
+#include "CorePrereqs.h"
+
 #include "cpptcl/CppTcl.h"
 
@@ -44 +46 @@
 
             static void puts(Tcl::object const &args);
-            static std::string execute(Tcl::object const &args);
+            static void execute(Tcl::object const &args);
+            static std::string orxonox(Tcl::object const &args);
             static std::string tcl(const std::string& tclcode);
+            static bool TclBind::eval(const std::string& tclcode);
 
         private: