Changeset 7403 in orxonox.OLD for trunk/src/lib/shell/shell_command.cc

Timestamp:

Apr 27, 2006, 5:49:12 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: more exists functions to ClassList, and improved shellcompletion

File:

• trunk/src/lib/shell/shell_command.cc (modified) (6 diffs)

trunk/src/lib/shell/shell_command.cc

@@ -70 +70 @@
   ShellCommand* ShellCommand::registerCommand(const std::string& commandName, const std::string& className, const Executor& executor)
   {
-    if (ShellCommand::isRegistered(commandName, className))
+    if (ShellCommand::exists(commandName, className))
       return NULL;
     else
@@ -104 +104 @@
    * This is checked in the registerCommand-function.
    */
-  bool ShellCommand::isRegistered(const std::string& commandName, const std::string& className)
-  {
-    const ShellCommandClass* checkClass = ShellCommandClass::isRegistered(className);
-    if (checkClass != NULL)
+  bool ShellCommand::exists(const std::string& commandName, const std::string& className)
+  {
+    const ShellCommandClass* checkClass = ShellCommandClass::exists(className);
+    if (likely(checkClass != NULL))
     {
       std::vector<ShellCommand*>::const_iterator elem;
@@ -139 +139 @@
     bool emptyComplete = false;                  //< if the completion input is empty string. e.g ""
     //  long completeType = SHELLC_NONE;           //< the Type we'd like to complete.
+
     SubString inputSplits(executionString, SubString::WhiteSpacesWithComma);
 
@@ -147 +148 @@
 
     // if we only have one input (!MUST BE AN ALIAS)
-    if (inputSplits.size() >= 1)
-    {
-      // CHECK FOR ALIAS
-      std::vector<ShellCommandAlias*>::const_iterator alias;
-      for (alias = ShellCommandAlias::getAliases().begin(); alias != ShellCommandAlias::getAliases().end(); alias++ )
-      {
-        if (inputSplits.getString(0) == (*alias)->getName() && (*alias)->getCommand() != NULL &&
-            (*alias)->getCommand()->shellClass != NULL )
+    // CHECK FOR ALIAS
+    std::vector<ShellCommandAlias*>::const_iterator alias;
+    for (alias = ShellCommandAlias::getAliases().begin(); alias != ShellCommandAlias::getAliases().end(); alias++ )
+    {
+      if (inputSplits.getString(0) == (*alias)->getName() && (*alias)->getCommand() != NULL &&
+          (*alias)->getCommand()->shellClass != NULL )
+      {
+        objectList = ClassList::getList((*alias)->getCommand()->shellClass->getName());
+        if (objectList != NULL)
         {
-          objectList = ClassList::getList((*alias)->getCommand()->shellClass->getName());
-          if (objectList != NULL)
+          (*(*alias)->getCommand()->executor)(objectList->front(), inputSplits.getSubSet(1).join());
+          return true;
+        }
+      }
+    }
+
+    // looking for a Matching Class (in the First Argument)
+    std::vector<ShellCommandClass*>::iterator commandClassIT;
+    for (commandClassIT = ShellCommandClass::commandClassList.begin(); commandClassIT != ShellCommandClass::commandClassList.end(); commandClassIT++)
+    {
+      if (inputSplits[0] == (*commandClassIT)->getName())
+      {
+        //elemCL->getName();
+        classID = ClassList::StringToID((*commandClassIT)->getName());
+        commandClass = (*commandClassIT);
+        objectList = ClassList::getList((ClassID)classID);
+        break;
+      }
+    }
+
+    // Second Agument. (either Object, or Function)
+    if (commandClass != NULL && inputSplits.size() >= 2)
+    {
+      int fktPos = 1; // The position of the Function (either at pos 1(if object given), or 2)
+      // If we have an ObjectList.
+      if (objectList != NULL)
+      {
+        // Checking for a Match in the Objects of classID (else take the first)
+        std::list<BaseObject*>::const_iterator object;
+        for (object = objectList->begin(); object != objectList->end(); object++)
+        {
+          if ((*object)->getName() != NULL && inputSplits[1] == (*object)->getName())
           {
-            (*(*alias)->getCommand()->executor)(objectList->front(), inputSplits.getSubSet(1).join());
-            return true;
+            /// TODO make this work for multiple Objects at once.
+            objectPointer = (*object);
+            fktPos = 2;
+            break;
           }
         }
-      }
-
-      // looking for a Matching Class
-      std::vector<ShellCommandClass*>::iterator commandClassIT;
-      for (commandClassIT = ShellCommandClass::commandClassList.begin(); commandClassIT != ShellCommandClass::commandClassList.end(); commandClassIT++)
-      {
-        if ((*commandClassIT)->getName() && inputSplits[0] == (*commandClassIT)->getName())
+
+        // if we did not find an Object with matching name, take the first.
+        if (objectPointer == NULL)
+          objectPointer = objectList->front();
+      }
+
+      // match a function.
+      if (commandClass != NULL && (fktPos == 1 || (fktPos == 2 && inputSplits.size() >= 3)))
+      {
+        std::vector<ShellCommand*>::iterator cmdIT;
+        for (cmdIT = commandClass->commandList.begin(); cmdIT != commandClass->commandList.end(); cmdIT++)
         {
-          //elemCL->getName();
-          classID = ClassList::StringToID((*commandClassIT)->getName());
-          commandClass = (*commandClassIT);
-          objectList = ClassList::getList((ClassID)classID);
-          break;
-        }
-      }
-
-      // Second Agument. (either Object, or Function)
-      if (commandClass != NULL && inputSplits.size() >= 2)
-      {
-        int fktPos = 1; // The position of the Function (either at pos 1, or 2)
-        // If we have an ObjectList.
-        if (objectList != NULL)
-        {
-          // Checking for a Match in the Objects of classID (else take the first)
-          std::list<BaseObject*>::const_iterator object;
-          for (object = objectList->begin(); object != objectList->end(); object++)
+          if (inputSplits[fktPos] == (*cmdIT)->getName())
           {
-            if ((*object)->getName() != NULL && inputSplits[1] == (*object)->getName())
+            if (objectPointer == NULL && (*cmdIT)->executor->getType() & Executor_Objective)
+              return false;
+            else
             {
-              objectPointer = (*object);
-              fktPos = 2;
-              break;
-            }
-          }
-
-          // if we did not find an Object with matching name, take the first.
-          if (objectPointer == NULL)
-            objectPointer = objectList->front();
-        }
-
-        // match a function.
-        if (commandClass != NULL && (fktPos == 1 || (fktPos == 2 && inputSplits.size() >= 3)))
-        {
-          std::vector<ShellCommand*>::iterator cmdIT;
-          for (cmdIT = commandClass->commandList.begin(); cmdIT != commandClass->commandList.end(); cmdIT++)
-          {
-            if (inputSplits[fktPos] == (*cmdIT)->getName())
-            {
-              if (objectPointer == NULL && (*cmdIT)->executor->getType() & Executor_Objective)
-                return false;
-              else
-              {
-                (*(*cmdIT)->executor)(objectPointer, inputSplits.getSubSet(fktPos+1).join()); /// TODO CHECK IF OK
-                return true;
-              }
+              (*(*cmdIT)->executor)(objectPointer, inputSplits.getSubSet(fktPos+1).join()); /// TODO CHECK IF OK
+              return true;
             }
           }
@@ -234 +233 @@
     if (this == NULL)
       return NULL;
-    else
-    {
-      this->description = description;
-      return this;
-    }
+    this->description = description;
+    return this;
   }
 
@@ -344 +340 @@
   * @returns true on success, false otherwise
    */
+
   bool ShellCommandAlias::getCommandListOfAlias(std::list<std::string>& stringList)
   {