Changeset 7230 for code/branches/consolecommands3/src/libraries/core/command/CommandEvaluation.h

Timestamp:

Aug 27, 2010, 7:29:49 PM (14 years ago)

Author:

landauf

Message:

re-implemented parameter evaluation in CommandEvaluation and simplified parse() and evaluateParams() in Executor.

File:

• code/branches/consolecommands3/src/libraries/core/command/CommandEvaluation.h (modified) (5 diffs)

code/branches/consolecommands3/src/libraries/core/command/CommandEvaluation.h

@@ -34 +34 @@
 #include <string>
 
-#include "ArgumentCompletionListElement.h"
 #include "util/SubString.h"
 #include "util/MultiType.h"
+#include "ArgumentCompletionListElement.h"
+#include "Functor.h"
 
 namespace orxonox
@@ -47 +48 @@
             CommandEvaluation();
 
-            int execute() const;
-            MultiType query(int* error = 0) const;
+            int execute();
+            MultiType query(int* error = 0);
 
-            std::string complete() const;
-            std::string hint() const;
+            std::string complete();
+            std::string hint();
+
+            int evaluateParams(bool bPrintError = false);
 
             inline bool isValid() const
@@ -59 +62 @@
                 { return this->execCommand_; }
 
-//            void setEvaluatedParameter(unsigned int index, MultiType param);
-//            MultiType getEvaluatedParameter(unsigned int index) const;
+            void setEvaluatedParameter(unsigned int index, const MultiType& param);
+            MultiType getEvaluatedParameter(unsigned int index) const;
 
         private:
@@ -69 +72 @@
             const std::string& getToken(unsigned int i) const;
 
-            void retrievePossibleArguments() const;
+            void retrievePossibleArguments();
 
             static void strip(ArgumentCompletionList& list, const std::string& fragment);
@@ -84 +87 @@
             unsigned int execArgumentsOffset_;
             unsigned int hintArgumentsOffset_;
-            mutable bool bPossibleArgumentsRetrieved_;
-            mutable ArgumentCompletionList possibleArguments_;
+            bool bPossibleArgumentsRetrieved_;
+            ArgumentCompletionList possibleArguments_;
+
+            bool bEvaluatedParams_;
+            bool bTriedToEvaluatedParams_;
+            unsigned int numberOfEvaluatedParams_;
+            MultiType param_[MAX_FUNCTOR_ARGUMENTS];
     };
 }