Changeset 7189 for code/branches/consolecommands3/src/libraries/core/TclBind.cc

Timestamp:

Aug 19, 2010, 4:57:06 PM (14 years ago)

Author:

landauf

Message:

changed passing of the returnvalue in the command execution pipeline:

• Functor: operator() directly returns the returnvalue of the executed function (if any, otherwise a MultiType whose null() function evaluates to true). The returnvalue is no longer stored in the Functor.
• Executor: The same behavior of operator() like in Functor. Additionally the parse() function returns the returnvalue of the executed function instead of a boolean status. The status can be retrieved by passing a pointer to a bool to the function.
• CommandExecutor: execute() works like before (returns only a boolean status), but added a new function query() which returns the returnvalue of the executed command. The status of query() can be retrieved by optionally passing an pointer to a bool.
• CommandEvaluation: same as for CommandExecutor: execute() like before, added query()
• TclBind::eval() returns the returnvalue of the evaluated tcl command. The status can also be retrieved by passing a pointer to a bool.
• The Shell prints the returnvalue (if available) of an executed command

• added a constructor to MultiType to directly create it from an mbool. The mbool will be converted to a bool, so it loses it's internal state.

File:

• code/branches/consolecommands3/src/libraries/core/TclBind.cc (modified) (2 diffs)

code/branches/consolecommands3/src/libraries/core/TclBind.cc

@@ -134 +134 @@
         const std::string& command = stripEnclosingBraces(args.get());
 
-        if (!CommandExecutor::execute(command, false))
+        bool success;
+        const std::string& result = CommandExecutor::query(command, &success, false);
+        if (!success)
         {
             COUT(1) << "Error: Can't execute command \"" << command << "\"!" << std::endl;
         }
 
-        if (CommandExecutor::getLastEvaluation().hasReturnvalue())
-            return CommandExecutor::getLastEvaluation().getReturnvalue().getString();
-
-        return "";
+        return result;
     }
 
@@ -181 +180 @@
     }
 
-    bool TclBind::eval(const std::string& tclcode)
+    std::string TclBind::eval(const std::string& tclcode, bool* success)
     {
+        if (success)
+            *success = true;
+
         try
         {
-            TclBind::getInstance().interpreter_->eval(tclcode);
-            return true;
+            return TclBind::getInstance().interpreter_->eval(tclcode);
         }
         catch (Tcl::tcl_error const &e)
         {   COUT(1) << "Tcl error: " << e.what() << std::endl;   }
 
-        return false;
+        if (success)
+            *success = false;
+        return "";
     }
 }