Changeset 7409 in orxonox.OLD

Timestamp:

Apr 27, 2006, 9:31:43 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: first CompletionPlugin works almost

Location:

trunk/src/lib/shell

Files:

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

trunk/src/lib/shell/shell_command.cc

@@ -114 +114 @@
     if (likely(checkClass != NULL))
     {
+      printf("TEST\n");
       std::vector<ShellCommand*>::const_iterator elem;
       for (elem = checkClass->commandList.begin(); elem != checkClass->commandList.end(); elem++)
-      {
         if (commandName == (*elem)->getName())
         {
@@ -122 +122 @@
           return (*elem);
         }
-      }
-      return NULL;
-    }
-    else
-      return NULL;
+    }
+   return NULL;
   }
 

trunk/src/lib/shell/shell_command.h

@@ -75 +75 @@
     static bool exists(const std::string& commandName, const std::string& className);
 
+    const ShellCommandClass* const getCommandClass() const { return this->shellClass; };
+    const ShellCommandAlias* const getAlias() const { return this->alias; }
     unsigned int getParamCount() const { return this->executor->getParamCount(); }
     const CompletorPlugin* const getCompletorPlugin(unsigned int i) const { return this->completors[i]; };

trunk/src/lib/shell/shell_completion.cc

@@ -105 +105 @@
       this->objectComplete(completeString, classID);
     if (completeType & FunctionCompletion)
-      this->commandComplete(completeString, inputSplits.getString(0));
+      this->commandComplete(completeString, inputSplits[0]);
     if (completeType & AliasCompletion)
       this->aliasComplete(completeString);
@@ -111 +111 @@
     if (completeType == NullCompletion)
     {
-      printf("Completing a Parameter\n");
-//      ShellCommand::
+      const ShellCommand* sc = ShellCommand::getCommand(inputSplits[2], inputSplits[0]);
+      if (sc != NULL)
+      {
+        std::vector<std::string> test;
+        sc->getCompletorPlugin(0)->addToCompleteList(test, inputSplits[inputSplits.size()-1]);
+      }
     }
 

trunk/src/lib/shell/shell_completion_plugin.cc

@@ -33 +33 @@
   void CompletorDefault::addToCompleteList(std::vector<std::string>& completionList, const std::string& completionBegin) const
   {
-    PRINT(0)("%s", MultiType::MultiTypeToString(this->_value->getType()).c_str());
+    PRINT(0)("Requires '%s'\n", MultiType::MultiTypeToString(this->_value->getType()).c_str());
   }