Changeset 7415 in orxonox.OLD for trunk

Timestamp:

Apr 28, 2006, 1:30:13 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: Super-good completion , and extremely tired bensch

Location:

trunk/src/lib/shell

Files:

• shell_command.cc (modified) (1 diff)
• shell_completion.cc (modified) (4 diffs)
• shell_completion.h (modified) (1 diff)

trunk/src/lib/shell/shell_command.cc

@@ -184 +184 @@
       {
         retCmd = ShellCommand::getCommand(strings[2], cmdClass);
-        paramBegin = 3;
+          paramBegin = 3;
       }
       if (retCmd != NULL) // check for the paramBegin.

trunk/src/lib/shell/shell_completion.cc

@@ -56 +56 @@
     long completeType = NullCompletion;              //< the Type we'd like to complete.
     std::string completeString = "";                 //< the string to complete.
-    unsigned int parameterBegin = 0;                 //< The SubString-entry, the Parameters begin.
+    unsigned int completeParam = 0;                  //< The Parameter to finish.
     const ShellCommand* command = NULL;              //< The Command.
 
@@ -102 +102 @@
     if (completeType == NullCompletion)
     {
-
+      unsigned int parameterBegin = parameterBegin;
       if ((command = ShellCommand::getCommandFromInput(inputSplits, parameterBegin)) != NULL)
         completeType |= ParamCompletion;
+      if (emptyComplete)
+        completeParam = inputSplits.size() - parameterBegin;
+      else
+        completeParam = inputSplits.size() - parameterBegin - 1;
     }
 
@@ -116 +120 @@
       this->aliasComplete(completeString);
     if (completeType & ParamCompletion)
-      this->paramComplete(completeString, command);
+      this->paramComplete(completeString, command, completeParam);
 
     this->generalComplete(input, completeString);
@@ -177 +181 @@
    * @returns true on succes, false if something went wrong
    */
-  bool ShellCompletion::paramComplete(const std::string& paramBegin, const ShellCommand* command)
-  {
+  bool ShellCompletion::paramComplete(const std::string& paramBegin, const ShellCommand* command, unsigned int paramNumber)
+  {
+    if (paramNumber >= command->getParamCount())
+    {
+      PRINT(0)("Last Parameter reached\n");
+      return false;
+    }
     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));
+    command->getCompletorPlugin(paramNumber)->addToCompleteList(completed, paramBegin);
+    for (unsigned int i = 0; i < completed.size(); i++)
+      this->completionList.push_back(CompletionElement(completed[i], ParamCompletion));
+    return true;
   }
 

trunk/src/lib/shell/shell_completion.h

@@ -56 +56 @@
       bool commandComplete(const std::string& commandBegin, const std::string& className);
       bool aliasComplete(const std::string& aliasBegin);
-      bool paramComplete(const std::string& paramBegin, const ShellCommand* command);
+      bool paramComplete(const std::string& paramBegin, const ShellCommand* command, unsigned int paramNumber);
 
       // Generally Completes.