Changeset 9406 in orxonox.OLD for trunk/src/lib/shell

Timestamp:

Jul 24, 2006, 11:09:47 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the proxy back

merged with commandsvn merge -r9346:HEAD ​https://svn.orxonox.net/orxonox/branches/proxy .

no conflicts

Location:

trunk/src/lib/shell

Files:

• shell_command.cc (modified) (11 diffs)
• shell_command_class.cc (modified) (1 diff)
• shell_completion.cc (modified) (1 diff)

trunk/src/lib/shell/shell_command.cc

@@ -119 +119 @@
 
     CmdList::const_iterator elem;
-    for (elem = cmdClass->commandList.begin(); elem != cmdClass->commandList.end(); elem++)
-      if (commandName == (*elem)->getName())
-        return (*elem);
+    for (unsigned int i = 0; i < cmdClass->commandList.size(); i++)
+    {
+      if (commandName == cmdClass->commandList[i]->getName())
+        return (cmdClass->commandList[i]);
+    }
     return NULL;
   }
@@ -137 +139 @@
     if (likely(checkClass != NULL))
       return ShellCommand::getCommand(commandName, checkClass);
-    return NULL;
+    else
+      return NULL;
   }
 
@@ -149 +152 @@
   const ShellCommand* const ShellCommand::getCommandFromInput(const std::string& inputLine, unsigned int& paramBegin, std::vector<BaseObject*>* boList)
   {
-    return ShellCommand::getCommandFromInput(SubString(inputLine, SubString::WhiteSpaces), paramBegin);
+    return ShellCommand::getCommandFromInput(SubString(inputLine, SubString::WhiteSpaces), paramBegin, boList);
   }
 
@@ -199 +202 @@
       {
         // Search for Objects.
-        retCmd = ShellCommand::getCommand(strings[1], cmdClass);
+        retCmd = ShellCommand::getCommand((strings.size() > 1) ? strings[1] : "", cmdClass);
         if (retCmd != NULL)
         {
@@ -210 +213 @@
       if (retCmd == NULL && strings.size() >= 2)
       {
-        retCmd = ShellCommand::getCommand(strings[2], cmdClass);
+        retCmd = ShellCommand::getCommand((strings.size() > 2) ? strings[2] : "", cmdClass);
         if (retCmd != NULL)
         {
@@ -254 +257 @@
       {
         for (bo = objectList->begin(); bo != objectList->end(); bo++)
-          if ((*bo)->getName() != NULL && !nocaseCmp(objectDescriptor, (*bo)->getName(), objectDescriptor.size()))
+          if (!nocaseCmp(objectDescriptor, (*bo)->getName(), objectDescriptor.size()))
             boList->push_back(*bo);
       }
@@ -298 +301 @@
       for(std::vector<BaseObject*>::const_iterator bo = boList.begin(); bo != boList.end(); ++bo)
       {
-        PRINT(0)("Command '%s' on '%s::%s'\n", sc->getName(), (*bo)->getClassName(), (*bo)->getName());
-        (*sc->executor)((*bo), inputSplits.getSubSet(paramBegin));
+        PRINT(0)("Command '%s' on '%s::%s'\n", sc->getCName(), (*bo)->getClassCName(), (*bo)->getCName());
+        (*sc->executor)((*bo), inputSplits.subSet(paramBegin));
       }
       return true;
@@ -331 +334 @@
     if (this->alias != NULL)
     {
-      PRINTF(2)("not more than one Alias allowed for functions (%s::%s)\n", this->getName(), this->shellClass->getName());
+      PRINTF(2)("not more than one Alias allowed for functions (%s::%s)\n", this->getCName(), this->shellClass->getCName());
     }
     else
@@ -369 +372 @@
     {
       PRINTF(1)("Parameter %d not inside of valid ParameterCount %d of Command %s::%s\n",
-                parameter, this->executor->getParamCount(), this->getName(), this->shellClass->getName());
+                parameter, this->executor->getParamCount(), this->getCName(), this->shellClass->getCName());
     }
     else
@@ -375 +378 @@
 //       if(this->completors[parameter] == NULL)
 //       delete this->completors[parameter];
-//       this->completors[parameter] = completorPlugin.clone(); 
+//       this->completors[parameter] = completorPlugin.clone();
     }
     return this;
@@ -385 +388 @@
   void ShellCommand::help() const
   {
-    PRINT(0)("%s ", this->getName());
+    PRINT(0)("%s ", this->getCName());
   }
 

trunk/src/lib/shell/shell_command_class.cc

@@ -199 +199 @@
         for (cmdIT = (*classIT)->commandList.begin(); cmdIT != (*classIT)->commandList.end(); cmdIT++)
         {
-          PRINT(0)("  command:'%s' : params:%d: ", (*cmdIT)->getName(), (*cmdIT)->executor->getParamCount());
+          PRINT(0)("  command:'%s' : params:%d: ", (*cmdIT)->getCName(), (*cmdIT)->executor->getParamCount());
           /// FIXME
           /*          for (unsigned int i = 0; i< elem->paramCount; i++)

trunk/src/lib/shell/shell_completion.cc

@@ -290 +290 @@
     for(bo = inputList.begin(); bo != inputList.end(); bo++)
     {
-      if ((*bo)->getName() != NULL &&
-          strlen((*bo)->getName()) >= searchLength &&
+      if ((*bo)->getName().size() >= searchLength &&
           !nocaseCmp((*bo)->getName(), completionBegin, searchLength))
       {