Changeset 3350 for code/branches/resource/src/core/TclThreadManager.cc

Timestamp:

Jul 25, 2009, 9:46:24 PM (15 years ago)

Author:

landauf

Message:

small changes relating to tcl

File:

• code/branches/resource/src/core/TclThreadManager.cc (modified) (3 diffs)

code/branches/resource/src/core/TclThreadManager.cc

@@ -257 +257 @@
             newbundle->interpreter_->def("execute",      TclThreadManager::tcl_execute,      Tcl::variadic());
             newbundle->interpreter_->def("crossexecute", TclThreadManager::tcl_crossexecute, Tcl::variadic());
-            newbundle->interpreter_->eval("proc query       args     { orxonox::query " + id_string + " $args }");
+            newbundle->interpreter_->eval("proc query      {args}    { orxonox::query " + id_string + " $args }");
             newbundle->interpreter_->eval("proc crossquery {id args} { orxonox::crossquery " + id_string + " $id $args }");
+            newbundle->interpreter_->eval("proc running    {}        { return [orxonox::running " + id_string + "] }");
 
             // Define a variable containing the thread id
@@ -268 +269 @@
 
             // Redefine some native functions
-//            newbundle->interpreter_->eval("rename while tcl::while");
-//            newbundle->interpreter_->eval("proc while {test command} { tcl::while {[uplevel 1 expr $test]} {uplevel 1 $command} }"); // (\"$test\" && [orxonox::running " + id + "]])
-//            newbundle->interpreter_->eval("rename for tcl::for");
-//            newbundle->interpreter_->eval("proc for {start test next command} { uplevel tcl::for \"$start\" \"$test\" \"$next\" \"$command\" }");
+            newbundle->interpreter_->eval("rename while tcl::while");
+            newbundle->interpreter_->eval("rename orxonox::while while");
+            newbundle->interpreter_->eval("rename for tcl::for");
+            newbundle->interpreter_->eval("rename orxonox::for for");
         }
         catch (const Tcl::tcl_error& e)
@@ -296 +297 @@
         // TODO
         // Not yet implemented
+        TclInterpreterBundle* bundle = TclThreadManager::getInstance().getInterpreterBundle(id);
+        if (bundle)
+        {
+            bundle->bRunning_ = false;
+        }
     }