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

Timestamp:

Apr 27, 2008, 4:54:31 PM (17 years ago)

Author:

landauf

Message:

tcl can now initialize itself by loading the *.tcl files from media/tcl

File:

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

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

@@ -339 +339 @@
     }
 
+    const CommandEvaluation& CommandExecutor::getLastEvaluation()
+    {
+        return CommandExecutor::getInstance().evaluation_;
+    }
+
     Executor& CommandExecutor::addConsoleCommandShortcut(ExecutorStatic* executor)
     {
@@ -385 +390 @@
     bool CommandExecutor::execute(const CommandEvaluation& evaluation)
     {
-std::cout << "CE_execute: " << evaluation.processedCommand_ << "\n";
         SubString tokens(evaluation.processedCommand_, " ", SubString::WhiteSpaces, false, '\\', false, '"', false, '(', ')', false, '\0');
 
         if (evaluation.bEvaluatedParams_ && evaluation.evaluatedExecutor_)
         {
+std::cout << "CE_execute (evaluation): " << evaluation.evaluatedExecutor_->getName() << " " << evaluation.param_[0] << " " << evaluation.param_[1] << " " << evaluation.param_[2] << " " << evaluation.param_[3] << " " << evaluation.param_[4] << std::endl;
             (*evaluation.evaluatedExecutor_)(evaluation.param_[0], evaluation.param_[1], evaluation.param_[2], evaluation.param_[3], evaluation.param_[4]);
             return true;
         }
 
+std::cout << "CE_execute: " << evaluation.processedCommand_ << "\n";
         switch (evaluation.state_)
         {
@@ -643 +649 @@
             lastToken = lastToken.substr(0, lastToken.size() - 1);
             CommandExecutor::getEvaluation().tokens_.pop_back();
-            CommandExecutor::getEvaluation().tokens_.append(SubString(lastToken, " "));
+            CommandExecutor::getEvaluation().tokens_.append(SubString(lastToken, " ", "", true, '\0', false, '\0', false, '\0', '\0', false, '\0'));
         }