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

Timestamp:

Aug 19, 2010, 4:57:06 PM (15 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/Executor.cc (modified) (5 diffs)

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

@@ -50 +50 @@
     }
 
-    bool Executor::parse(const std::string& params, const std::string& delimiter) const
-    {
+    MultiType Executor::parse(const std::string& params, bool* success, const std::string& delimiter) const
+    {
+        if (success)
+            *success = true;
+
         unsigned int paramCount = this->functor_->getParamCount();
 
@@ -57 +60 @@
         {
             COUT(5) << "Calling Executor " << this->name_ << " through parser without parameters." << std::endl;
-            (*this->functor_)();
+            return (*this->functor_)();
         }
         else if (paramCount == 1)
@@ -65 +68 @@
             {
                 COUT(5) << "Calling Executor " << this->name_ << " through parser with one parameter, using whole string: " << params << std::endl;
-                (*this->functor_)(MultiType(params));
+                return (*this->functor_)(MultiType(params));
             }
             else if (!this->defaultValue_[0].null())
             {
                 COUT(5) << "Calling Executor " << this->name_ << " through parser with one parameter, using default value: " << this->defaultValue_[0] << std::endl;
-                (*this->functor_)(this->defaultValue_[0]);
+                return (*this->functor_)(this->defaultValue_[0]);
             }
             else
             {
                 COUT(2) << "Warning: Can't call executor " << this->name_ << " through parser: Not enough parameters or default values given (input: " << temp << ")." << std::endl;
-                return false;
+                if (success)
+                    *success = false;
+                return MT_Type::Null;
             }
         }
@@ -87 +92 @@
                 {
                     COUT(2) << "Warning: Can't call executor " << this->name_ << " through parser: Not enough parameters or default values given (input:" << params << ")." << std::endl;
-                    return false;
+                    if (success)
+                        *success = false;
+                    return MT_Type::Null;
                 }
             }
@@ -120 +127 @@
             {
                 case 2:
-                    (*this->functor_)(param[0], param[1]);
-                    break;
+                    return (*this->functor_)(param[0], param[1]);
                 case 3:
-                    (*this->functor_)(param[0], param[1], param[2]);
-                    break;
+                    return (*this->functor_)(param[0], param[1], param[2]);
                 case 4:
-                    (*this->functor_)(param[0], param[1], param[2], param[3]);
-                    break;
+                    return (*this->functor_)(param[0], param[1], param[2], param[3]);
                 case 5:
-                    (*this->functor_)(param[0], param[1], param[2], param[3], param[4]);
-                    break;
-            }
-        }
-
-        return true;
+                    return (*this->functor_)(param[0], param[1], param[2], param[3], param[4]);
+            }
+        }
+
+        return MT_Type::Null;
     }