Changeset 7411 in orxonox.OLD

Timestamp:

Apr 27, 2006, 11:23:55 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: some command-stuff

Location:

trunk/src/lib/shell

Files:

• shell_command.cc (modified) (4 diffs)
• shell_command.h (modified) (1 diff)
• shell_command_class.cc (modified) (2 diffs)
• shell_command_class.h (modified) (2 diffs)

trunk/src/lib/shell/shell_command.cc

@@ -114 +114 @@
     if (likely(checkClass != NULL))
     {
-      printf("TEST\n");
       std::vector<ShellCommand*>::const_iterator elem;
       for (elem = checkClass->commandList.begin(); elem != checkClass->commandList.end(); elem++)
@@ -123 +122 @@
         }
     }
-   return NULL;
+    return NULL;
   }
 
@@ -153 +152 @@
     const std::list<BaseObject*>* objectList = NULL;   //< the list of Objects stored in classID
     BaseObject* objectPointer = NULL;            //< a pointer to th Object to Execute the command on
-    bool emptyComplete = false;                  //< if the completion input is empty string. e.g ""
+    //    bool emptyComplete = false;                  //< if the completion input is empty string. e.g ""
     //  long completeType = SHELLC_NONE;           //< the Type we'd like to complete.
 
@@ -241 +240 @@
   }
 
+
   /**
    * @brief lets a command be described

trunk/src/lib/shell/shell_command.h

@@ -62 +62 @@
     friend class ShellCommandClass;
   public:
+    //! an enumerator for different types the Shell parses.
+    typedef enum {
+      NullRecognition         = 0,
+      ClassRecognition              = 1,
+      ObjectRecognition             = 2,
+      FunctionRecognition           = 4,
+      AliasRecognition              = 8,
+      ParameterRecognition          = 16,
+    } RecognitionType;
+
     static bool execute (const std::string& executionString);
 

trunk/src/lib/shell/shell_command_class.cc

@@ -114 +114 @@
     std::vector<ShellCommandClass*>::const_iterator classIT;
     for (classIT = ShellCommandClass::commandClassList.begin(); classIT != ShellCommandClass::commandClassList.end(); classIT++)
-    {
       if (className == (*classIT)->className)
-      {
-        if ((*classIT)->classID == CL_NULL)
-          (*classIT)->classID = ClassList::StringToID(className);
-
         return (*classIT);
-      }
-    }
     return NULL;
   }
@@ -131 +124 @@
    * @returns the CommandClass if found, NULL otherwise
    */
-/*  bool ShellCommandClass::exists(const std::string& className)
+  bool ShellCommandClass::exists(const std::string& className)
   {
+    return (ShellCommandClass::getCommandClass(className) != NULL);
+  }
 
-  }*/
+  ClassID ShellCommandClass::getClassID()
+  {
+    if (this->classID == CL_NULL)
+      this->classID = ClassList::StringToID(this->className);
+    return this->classID;
+  }
+
 
   /**

trunk/src/lib/shell/shell_command_class.h

@@ -30 +30 @@
     static void unregisterAllCommands();
     static const ShellCommandClass* getCommandClass(const std::string& className);
+    ClassID getClassID();
     static bool exists(const std::string& className);
 
@@ -45 +46 @@
   private:
     const std::string                      className;                 //!< The Name of the Class. This should match the ClassName of the Commands Class.
-    long                                   classID;                   //!< The classID of this Class
+    ClassID                                classID;                   //!< The classID of this Class
     std::vector<ShellCommand*>             commandList;               //!< A list of Commands from this Class