Changeset 1187 for code/branches/console/src/core

Timestamp:

Apr 25, 2008, 12:51:29 AM (17 years ago)

Author:

landauf

Message:

some changes in commandexecutor and tclbind, but there's still a bug in the parameter evaluation

Location:

code/branches/console/src/core

Files:

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

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

@@ -270 +270 @@
     }
 
+    bool CommandEvaluation::hasReturnvalue() const
+    {
+        if (this->state_ == CS_Shortcut_Params || this->state_ == CS_Shortcut_Finished)
+        {
+            if (this->shortcut_)
+                return this->shortcut_->hasReturnvalue();
+        }
+        else if (this->state_ == CS_Function_Params || this->state_ == CS_Function_Finished)
+        {
+            if (this->function_)
+                return this->function_->hasReturnvalue();
+        }
+
+        return MT_null;
+    }
+
     MultiTypeMath CommandEvaluation::getReturnvalue() const
     {

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

@@ -95 +95 @@
             void evaluateParams();
 
+            bool hasReturnvalue() const;
             MultiTypeMath getReturnvalue() const;
 

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

@@ -3 +3 @@
 
 #include "ConsoleCommand.h"
+#include "CommandExecutor.h"
 #include "Debug.h"
-#include "cpptcl/CppTcl.h"
 #include "TclBind.h"
 
 namespace orxonox
 {
-    ConsoleCommandShortcutExtern(test, AccessLevel::None);
     ConsoleCommandShortcutExtern(tcl, AccessLevel::None);
 
-    void hello()
+    void Tcl_puts(Tcl::object const &args)
     {
-        std::cout << "Hello C++/Tcl!" << std::endl;
+        COUT(0) << args.get() << std::endl;
     }
 
-    void test()
+    std::string Tcl_unknown(Tcl::object const &a)
     {
-        Tcl::interpreter i;
-        i.def("hello", hello);
-
-        std::string script = "for {set i 0} {$i != 4} {incr i} { hello }";
-
-        i.eval(script);
+std::cout << "1\n";
+std::cout << a.get() << std::endl;
+        CommandEvaluation evaluation = CommandExecutor::evaluate(std::string(a.get()));
+std::cout << "2\n";
+        CommandExecutor::execute(evaluation);
+std::cout << "3\n";
+        if (evaluation.hasReturnvalue())
+        {
+std::cout << "4\n";
+            return evaluation.getReturnvalue().toString();
+        }
+std::cout << "5\n";
+        return "";
     }
 
@@ -32 +38 @@
         {
             static Tcl::interpreter i;
+            i.def("puts", Tcl_puts, Tcl::variadic());
+            i.def("blub", Tcl_unknown, Tcl::variadic());
             std::string output = i.eval(tclcode);
             COUT(0) << "tcl> " << output << std::endl;

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

@@ -2 +2 @@
 #define _TclBind_H__
 
+#include "cpptcl/CppTcl.h"
+
 namespace orxonox
 {
-    void hello();
-    void test();
+    Tcl::interpreter* createNewInterpreter();
+    void Tcl_puts(Tcl::object const &c);
+    std::string Tcl_unknown(Tcl::object const &c);
     std::string tcl(const std::string& tclcode);
 }