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

Timestamp:

Oct 8, 2005, 11:13:06 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: autocompletion now also works for Static Function-commandos

Location:

trunk/src/lib/shell

Files:

• shell_completion.cc (modified) (3 diffs)
• shell_completion.h (modified) (1 diff)

trunk/src/lib/shell/shell_completion.cc

@@ -120 +120 @@
     classID = ClassList::StringToID(inputSplits.getString(0));
     objectList = ClassList::getList(classID);
-    if (classID == CL_NULL)
-      return false;
-    else
-    {
-      if (objectList != NULL && objectList->getSize() == 1)
-        completeType |= SHELLC_FUNCTION;
+    if (classID != CL_NULL)
       completeType |= SHELLC_OBJECT;
-    }
+    //if (objectList != NULL && objectList->getSize() == 1)
+      completeType |= SHELLC_FUNCTION;
   }
   else if ((inputSplits.getCount() == 2 && emptyComplete == true) ||
@@ -144 +140 @@
     this->objectComplete(completeString, classID);
   if (completeType & SHELLC_FUNCTION)
-    this->functionComplete(completeString, classID);
+    this->functionComplete(completeString, inputSplits.getString(0));
   if (completeType & SHELLC_ALIAS)
     this->aliasComplete(completeString);
@@ -202 +198 @@
  * @param classID the class' ID to complete the function of
  */
-bool ShellCompletion::functionComplete(const char* functionBegin, long classID)
+bool ShellCompletion::functionComplete(const char* functionBegin, const char* className)
 {
   if (unlikely(functionBegin == NULL))
     return false;
   tList<const char> fktList;
-  ShellCommandClass::getCommandListOfClass(ClassList::IDToString(classID), &fktList);
+  ShellCommandClass::getCommandListOfClass(className, &fktList);
   //printf("%s\n", boList->firstElement()->getName());
   if (!this->addToCompleteList(&fktList, functionBegin, SHELLC_FUNCTION))

trunk/src/lib/shell/shell_completion.h

@@ -42 +42 @@
   bool objectComplete(const char* objectBegin, long classID);
 //  bool objectMatch(const char* objectBegin, long classID, unsigned int* length);
-  bool functionComplete(const char* functionBegin, long classID);
+  bool functionComplete(const char* functionBegin, const char* className);
 //  bool functionMatch(const char* functionBegin, long classID, unsigned int* length);
   bool aliasComplete(const char* aliasBegin);