Changeset 1390 for code/branches/console/src/core/CommandEvaluation.h

Timestamp:

May 23, 2008, 2:10:52 AM (16 years ago)

Author:

landauf

Message:

only girls sleep at this time

(started new implementation of ConsoleExecutor parser, but it's still buggy)

File:

• code/branches/console/src/core/CommandEvaluation.h (modified) (4 diffs)

code/branches/console/src/core/CommandEvaluation.h

@@ -44 +44 @@
         CS_Uninitialized,
         CS_Empty,
-        CS_FunctionClass_Or_Shortcut,
+        CS_ShortcutOrIdentifier,
         CS_Shortcut_Params,
         CS_Shortcut_Finished,
@@ -60 +60 @@
             void initialize(const std::string& command);
 
-            void execute() const;
+            bool execute() const;
             std::string complete() const;
             std::string hint() const;
@@ -101 +101 @@
                 { this->bNewCommand_ = bNewCommand; }
 
-            inline std::list<std::pair<const std::string*, const std::string*> >& getListOfPossibleFunctionClasses()
-                { return this->listOfPossibleFunctionClasses_; }
+            inline std::list<std::pair<const std::string*, const std::string*> >& getListOfPossibleIdentifiers()
+                { return this->listOfPossibleIdentifiers_; }
             inline std::list<std::pair<const std::string*, const std::string*> >& getListOfPossibleFunctions()
                 { return this->listOfPossibleFunctions_; }
+            inline std::list<std::pair<const std::string*, const std::string*> >& getListOfPossibleArguments()
+                { return this->listOfPossibleArguments_; }
 
             inline void setAdditionalParameter(const std::string& param)
@@ -132 +134 @@
             std::string additionalParameter_;
 
-            std::list<std::pair<const std::string*, const std::string*> > listOfPossibleFunctionClasses_;
+            std::list<std::pair<const std::string*, const std::string*> > listOfPossibleIdentifiers_;
             std::list<std::pair<const std::string*, const std::string*> > listOfPossibleFunctions_;
+            std::list<std::pair<const std::string*, const std::string*> > listOfPossibleArguments_;
 
             Identifier* functionclass_;