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

Timestamp:

Aug 27, 2010, 2:41:03 PM (14 years ago)

Author:

landauf

Message:

re-implemented CommandExecutor and CommandEvaluation. parameter evaluation is currently not implemented, will come soon.

File:

• code/branches/consolecommands3/src/libraries/core/command/Executor.cc (modified) (4 diffs)

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

@@ -36 +36 @@
 #include "util/StringUtils.h"
 #include "util/SubString.h"
+#include "CommandExecutor.h"
 
 namespace orxonox
@@ -49 +50 @@
     }
 
-    MultiType Executor::parse(const std::string& params, bool* success, const std::string& delimiter) const
-    {
-        if (success)
-            *success = true;
+    MultiType Executor::parse(const std::string& params, int* error, const std::string& delimiter, bool bPrintError) const
+    {
+        if (error)
+            *error = CommandExecutor::Success;
 
         unsigned int paramCount = this->functor_->getParamCount();
@@ -76 +77 @@
             else
             {
-                COUT(2) << "Warning: Can't call executor " << this->name_ << " through parser: Not enough parameters or default values given (input: " << temp << ")." << std::endl;
-                if (success)
-                    *success = false;
+                if (bPrintError)
+                    COUT(2) << "Warning: Can't call executor " << this->name_ << " through parser: Not enough parameters or default values given (input: " << temp << ")." << std::endl;
+                if (error)
+                    *error = CommandExecutor::Incomplete;
                 return MT_Type::Null;
             }
@@ -90 +92 @@
                 if (this->defaultValue_[i].null())
                 {
-                    COUT(2) << "Warning: Can't call executor " << this->name_ << " through parser: Not enough parameters or default values given (input:" << params << ")." << std::endl;
-                    if (success)
-                        *success = false;
+                    if (bPrintError)
+                        COUT(2) << "Warning: Can't call executor " << this->name_ << " through parser: Not enough parameters or default values given (input: " << params << ")." << std::endl;
+                    if (error)
+                        *error = CommandExecutor::Incomplete;
                     return MT_Type::Null;
                 }