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

Timestamp:

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

Author:

bensch

Message:

orxonox/trunk: Shell Completes some Parameters nicely now

File:

• trunk/src/lib/shell/shell_completion.cc (modified) (8 diffs)

trunk/src/lib/shell/shell_completion.cc

@@ -57 +57 @@
     std::string completeString = "";                 //< the string to complete.
     unsigned int parameterBegin = 0;                 //< The SubString-entry, the Parameters begin.
+    const ShellCommand* command = NULL;              //< The Command.
 
 
@@ -82 +83 @@
     // OBJECT/FUNCTION COMPLETIONS
     else if ((emptyComplete && inputSplits.size() == 1) ||
-              (!emptyComplete && inputSplits.size() == 2))
+             (!emptyComplete && inputSplits.size() == 2))
     {
       classID = ClassList::StringToID(inputSplits.getString(0));
@@ -99 +100 @@
 
     // Looking for ParameterCompletions.
+    if (completeType == NullCompletion)
+    {
+      if ((command = ShellCommand::getCommandFromInput(input)) != NULL)
+        completeType |= ParamCompletion;
+    }
 
     if (completeType & ClassCompletion)
@@ -108 +114 @@
     if (completeType & AliasCompletion)
       this->aliasComplete(completeString);
-
-    if (completeType == NullCompletion)
-    {
-      const ShellCommand* sc = ShellCommand::getCommand(inputSplits[2], inputSplits[0]);
-      if (sc != NULL)
-      {
-        std::vector<std::string> completed;
-        sc->getCompletorPlugin(0)->addToCompleteList(completed, inputSplits[inputSplits.size()-1]);
-        for (unsigned int i = 0; i < completed.size(); i++)
-          this->completionList.push_back(CompletionElement(completed[i], ParamCompletion));
-      }
-    }
+    if (completeType & ParamCompletion)
+      this->paramComplete(completeString, command);
+
 
 
@@ -157 +154 @@
     std::list<std::string> fktList;
     ShellCommandClass::getCommandListOfClass(className, fktList);
-    //printf("%s\n", boList->firstElement()->getName());
     if (!this->addToCompleteList(fktList, commandBegin, FunctionCompletion))
       return false;
@@ -172 +168 @@
     std::list<std::string> aliasList;
     ShellCommandAlias::getCommandListOfAlias(aliasList);
-    //printf("%s\n", boList->firstElement()->getName());
     if (!this->addToCompleteList(aliasList, aliasBegin, AliasCompletion))
       return false;
     return true;
+  }
+
+  /**
+   * @brief completes Parameters.
+   * @param paramBegin: Begin of the Parameters.
+   * @returns true on succes, false if something went wrong
+   */
+  bool ShellCompletion::paramComplete(const std::string& paramBegin, const ShellCommand* command)
+  {
+    std::vector<std::string> completed;
+    command->getCompletorPlugin(0)->addToCompleteList(completed, paramBegin);
+      for (unsigned int i = 0; i < completed.size(); i++)
+        this->completionList.push_back(CompletionElement(completed[i], ParamCompletion));
   }
 
@@ -197 +205 @@
     CompletionElement addElem = completionList.front();
     const std::string& addString = addElem.name;
-    unsigned int addLength = 0;
+    unsigned int addLength = addString.size();
     unsigned int inputLenght = begin.size();
 
-    // Determin the longest Match
-    addLength = addString.size();
-
+    // Determin the longest Match (starting with the first candidate in full length).
     CompletionType changeType = NullCompletion;
     std::vector<CompletionElement>::iterator charIT;
     for (charIT = completionList.begin(); charIT != completionList.end(); charIT++)
     {
+      printf("== %s\n", (*charIT).name.c_str());
       if ((*charIT).type != changeType)
       {
@@ -217 +224 @@
       for (unsigned int i = inputLenght; i < addLength; i++)
         if (addString[i] != (*charIT).name[i])
-        {
           addLength = i;
-          //       break;
-        }
     }
     PRINT(0)("\n");