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

Timestamp:

Apr 28, 2006, 12:54:04 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: Shell Completes some Parameters nicely now

File:

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

trunk/src/lib/shell/shell_command.cc

@@ -102 +102 @@
   }
 
-
   /**
    * @brief gets a command if it has already been registered.
    * @param commandName the name of the Command
-   * @param className the name of the Class the command should apply to.
+   * @param cmdClass the CommandClass of the Class the command is in.
+   * @returns The Registered Command, or NULL if it does not exist.
+   */
+  const ShellCommand* const ShellCommand::getCommand(const std::string& commandName, const ShellCommandClass* cmdClass)
+  {
+    assert(cmdClass != NULL);
+
+    std::vector<ShellCommand*>::const_iterator elem;
+    for (elem = cmdClass->commandList.begin(); elem != cmdClass->commandList.end(); elem++)
+      if (commandName == (*elem)->getName())
+        return (*elem);
+    return NULL;
+  }
+
+
+  /**
+   * @brief gets a command if it has already been registered.
+   * @param commandName the name of the Command
+   * @param className the name of the Class the command is in.
    * @returns The Registered Command, or NULL if it does not exist.
    */
@@ -113 +130 @@
     const ShellCommandClass* checkClass = ShellCommandClass::getCommandClass(className);
     if (likely(checkClass != NULL))
-    {
-      std::vector<ShellCommand*>::const_iterator elem;
-      for (elem = checkClass->commandList.begin(); elem != checkClass->commandList.end(); elem++)
-        if (commandName == (*elem)->getName())
-        {
-          PRINTF(2)("Command '%s::%s' already registered\n", className.c_str(), commandName.c_str());
-          return (*elem);
-        }
-    }
+      return ShellCommand::getCommand(commandName, checkClass);
     return NULL;
   }
+
+  /**
+   * @brief takes out an InputLine, searching for a Command.
+   * @param inputLine: the Input to analyse.
+   * @returns: The ShellCommand if found.
+   */
+  const ShellCommand* const ShellCommand::getCommandFromInput(const std::string& inputLine)
+  {
+    SubString strings(inputLine, SubString::WhiteSpaces);
+    // no input, no Command.
+    if (strings.size() == 0)
+      return NULL;
+
+    // CHECK FOR ALIAS
+    std::vector<ShellCommandAlias*>::const_iterator alias;
+    for (alias = ShellCommandAlias::getAliases().begin(); alias != ShellCommandAlias::getAliases().end(); alias++ )
+    {
+      if (strings[0] == (*alias)->getName())
+      {
+        assert ((*alias)->getCommand() != NULL && (*alias)->getCommand()->shellClass != NULL);
+        return (*alias)->getCommand();
+      }
+    }
+
+    const ShellCommandClass* cmdClass = ShellCommandClass::getCommandClass(strings[0]);
+    if (cmdClass != NULL)
+    {
+      const ShellCommand* retCmd;
+      if (strings.size() >= 1)
+        retCmd = ShellCommand::getCommand(strings[1], cmdClass);
+      if (retCmd == NULL && strings.size() >= 2)
+        retCmd = ShellCommand::getCommand(strings[2], cmdClass);
+      return retCmd;
+
+    }
+  }
+
 
   /**
@@ -303 +349 @@
     {
       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->getName(), this->shellClass->getName());
     }
     else