Changeset 1230 for code/branches/console/src/core/CommandExecutor.cc

Timestamp:

May 4, 2008, 4:44:24 PM (16 years ago)

Author:

landauf

Message:

added a tcl-thread, but there are still some bugs and problems

File:

• code/branches/console/src/core/CommandExecutor.cc (modified) (3 diffs)

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

@@ -50 +50 @@
     ConsoleCommandShortcutExtern(exec, AccessLevel::None);
     ConsoleCommandShortcutExtern(echo, AccessLevel::None);
+    ConsoleCommandShortcutExtern(puts, AccessLevel::None);
 
     ConsoleCommandShortcutExtern(read, AccessLevel::None);
@@ -92 +93 @@
     std::string echo(const std::string& text)
     {
+        std::cout << text << std::endl;
         return text;
+    }
+
+    void puts(bool newline, const std::string& text)
+    {
+        if (newline)
+            std::cout << text << std::endl;
+        else
+            std::cout << text;
     }
 
@@ -384 +394 @@
         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());
-        }
+            std::string temp = getLowercase(removeTrailingWhitespaces(command));
+            if (!(temp.find("tclthread") == 0 || temp.find("tclthreadmanager") == 0))
+                return TclBind::eval(command);
+        }
+
+        if ((CommandExecutor::getEvaluation().processedCommand_ != command) || (CommandExecutor::getEvaluation().state_ == CS_Uninitialized))
+            CommandExecutor::parse(command);
+
+        return CommandExecutor::execute(CommandExecutor::getEvaluation());
     }