Changeset 7417 in orxonox.OLD for trunk/src/lib

Timestamp:

Apr 28, 2006, 11:11:57 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: ShellCommand with new Improved and more general Functionality

Location:

trunk/src/lib/shell

Files:

• shell_command.cc (modified) (3 diffs)
• shell_command.h (modified) (2 diffs)

trunk/src/lib/shell/shell_command.cc

@@ -141 +141 @@
    * @returns: The ShellCommand if found.
    */
-  const ShellCommand* const ShellCommand::getCommandFromInput(const std::string& inputLine, unsigned int& paramBegin)
+  const ShellCommand* const ShellCommand::getCommandFromInput(const std::string& inputLine, unsigned int& paramBegin, std::vector<BaseObject*>* boList)
   {
     ShellCommand::getCommandFromInput(SubString(inputLine, SubString::WhiteSpaces), paramBegin);
@@ -152 +152 @@
    * @returns: The ShellCommand if found.
    */
-  const ShellCommand* const ShellCommand::getCommandFromInput(const SubString& strings, unsigned int& paramBegin)
+  const ShellCommand* const ShellCommand::getCommandFromInput(const SubString& strings, unsigned int& paramBegin, std::vector<BaseObject*>* boList)
   {
     // no input, no Command.
@@ -172 +172 @@
     }
 
+    // CHECK FOR COMMAND_CLASS
     const ShellCommandClass* cmdClass = ShellCommandClass::getCommandClass(strings[0]);
     if (cmdClass != NULL)
     {
       const ShellCommand* retCmd;
+      // Function/Command right after Class
       if (strings.size() >= 1)
       {
         retCmd = ShellCommand::getCommand(strings[1], cmdClass);
-        paramBegin = 2;
-      }
+        if (retCmd != NULL)
+        {
+          paramBegin = 2;
+          return retCmd;
+        }
+      }
+      // Function/Command after Class and 'Object'
       if (retCmd == NULL && strings.size() >= 2)
       {
         retCmd = ShellCommand::getCommand(strings[2], cmdClass);
+        if (retCmd != NULL)
+        {
           paramBegin = 3;
+          return retCmd;
+        }
       }
       if (retCmd != NULL) // check for the paramBegin.
         return retCmd;
     }
+    // Nothing usefull found at all.
     paramBegin = 0;
     return NULL;
   }
 
+  bool ShellCommand::fillObjectList(const std::string& objectDescriptor, ShellCommand* cmd, std::vector<BaseObject*>* boList)
+  {
+    assert (cmd != NULL && cmd->shellClass != NULL && boList != NULL);
+
+    const std::list<BaseObject*>* objectList = ClassList::getList(cmd->shellClass->getName());
+    if (objectList != NULL)
+    {
+      std::list<BaseObject*>::const_iterator bo;
+
+      // No Description given (only for speedup)
+      if (objectDescriptor.empty())
+      {
+        for (bo = objectList->begin(); bo != objectList->end(); bo++)
+          boList->push_back(*bo);
+      }
+      // some description
+      else
+      {
+        for (bo = objectList->begin(); bo != objectList->end(); bo++)
+          if ((*bo)->getName() != NULL && nocaseCmp(objectDescriptor, (*bo)->getName(), objectDescriptor.size()))
+            boList->push_back(*bo);
+      }
+    }
+  }
 
   /**

trunk/src/lib/shell/shell_command.h

@@ -76 +76 @@
     static const ShellCommand* const getCommand(const std::string& commandName, const ShellCommandClass* cmdClass);
     static bool exists(const std::string& commandName, const std::string& className);
-    static const ShellCommand* const getCommandFromInput(const std::string& inputLine, unsigned int& paramBegin);
-    static const ShellCommand* const getCommandFromInput(const SubString& strings, unsigned int& paramBegin);
+    static const ShellCommand* const getCommandFromInput(const std::string& inputLine, unsigned int& paramBegin, std::vector<BaseObject*>* boList = NULL);
+    static const ShellCommand* const getCommandFromInput(const SubString& strings, unsigned int& paramBegin, std::vector<BaseObject*>* boList = NULL);
 
     const ShellCommandClass* const getCommandClass() const { return this->shellClass; };
@@ -90 +90 @@
     virtual ~ShellCommand();
 
+    static bool fillObjectList(const std::string& objectDescriptor, ShellCommand* cmd, std::vector<BaseObject*>* boList);
     static const std::string& paramToString(long parameter);