Changeset 7189 for code/branches/consolecommands3/src/libraries/core/CommandEvaluation.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/CommandEvaluation.cc (modified) (3 diffs)

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

@@ -74 +74 @@
     bool CommandEvaluation::execute() const
     {
+        bool success;
+        this->query(&success);
+        return success;
+    }
+
+    MultiType CommandEvaluation::query(bool* success) const
+    {
+        if (success)
+            *success = false;
+
         if (!this->isValid())
-            return false;
+            return MT_Type::Null;
 
         if (this->bEvaluatedParams_ && this->function_)
         {
+            if (success)
+                *success = true;
             COUT(6) << "CE_execute (evaluation): " << this->function_->getName() << ' ' << this->param_[0] << ' ' << this->param_[1] << ' ' << this->param_[2] << ' ' << this->param_[3] << ' ' << this->param_[4] << std::endl;
-            (*this->function_)(this->param_[0], this->param_[1], this->param_[2], this->param_[3], this->param_[4]);
-            return true;
+            return (*this->function_)(this->param_[0], this->param_[1], this->param_[2], this->param_[3], this->param_[4]);
         }
 
@@ -90 +101 @@
             unsigned int startindex = this->getStartindex();
             if (this->commandTokens_.size() > startindex)
-                return this->function_->parse(removeSlashes(this->commandTokens_.subSet(startindex).join() + this->getAdditionalParameter()));
+                return this->function_->parse(removeSlashes(this->commandTokens_.subSet(startindex).join() + this->getAdditionalParameter()), success);
             else
-                return this->function_->parse(removeSlashes(this->additionalParameter_));
-        }
-
-        return false;
+                return this->function_->parse(removeSlashes(this->additionalParameter_), success);
+        }
+
+        return MT_Type::Null;
     }
 
@@ -233 +244 @@
     }
 
-    bool CommandEvaluation::hasReturnvalue() const
-    {
-        if (this->function_)
-            return this->function_->hasReturnvalue();
-
-        return MT_Type::Null;
-    }
-
-    MultiType CommandEvaluation::getReturnvalue() const
-    {
-        if (this->function_)
-            return this->function_->getReturnvalue();
-
-        return MultiType();
-    }
-
-
     unsigned int CommandEvaluation::getStartindex() const
     {