Changeset 7189 for code/branches/consolecommands3/src/libraries/core/Shell.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/Shell.cc (modified) (1 diff)

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

@@ -308 +308 @@
         this->updateListeners<&ShellListener::executed>();
 
-        if (!CommandExecutor::execute(this->inputBuffer_->get()))
+        bool success;
+        const std::string& result = CommandExecutor::query(this->inputBuffer_->get(), &success);
+        if (!success)
         {
             this->outputBuffer_ << "Error: Can't execute \"" << this->inputBuffer_->get() << "\"." << std::endl;
             this->outputChanged(Error);
+        }
+        else if (result != "")
+        {
+            this->outputBuffer_ << result << std::endl;
+            this->outputChanged(Command);
         }