Changeset 5185 in orxonox.OLD

Timestamp:

Sep 15, 2005, 5:16:14 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: half-faulty object Completion…. fixing

Location:

trunk/src/lib/shell

Files:

• shell_completion.cc (modified) (8 diffs)
• shell_input.h (modified) (1 diff)

trunk/src/lib/shell/shell_completion.cc

@@ -73 +73 @@
   char* functionEnd;    //< the end of the function string
 
+  PRINTF(4)("AutoComplete on input\n");
+
   if (input != NULL)
     this->input = input;
   if (this->input == NULL)
-    return false;
-  if (this->input->getText() == NULL)
+  {
+    PRINTF(2)("No ShellInput supplied\n");
+    return false;
+  }
+  if (this->input->getInput() == NULL)
     return this->classComplete("");
 
-  completionLine = this->input->getText() + strspn(this->input->getText(), " \t\n");
+
+  completionLine = this->input->getInput() + strspn(this->input->getInput(), " \t\n");
 
   SubString inputSplits(completionLine, true);
 
+
+  // CLASS COMPLETION
   if (inputSplits.getCount() == 0)
   {
-//    this->classComplete("");
+    PRINTF(5)("Listing all Classes\n");
+    this->classComplete("");
     return false;
   }
   else if (inputSplits.getCount() == 1 && strlen(inputSplits.getString(0)) == strlen(completionLine))
   {
-//    this->classComplete(inputSplits.getString(0));
-
-  }
-
-  if (inputSplits.getCount() > 1)
-  {
-
+    printf("trying to complete a Class with %d\n", inputSplits.getString(0));
+    this->classComplete(inputSplits.getString(0));
+  }
+
+  // OBJECT COMPLETIONS
+  else if ( inputSplits.getCount() <= 2 && strlen(inputSplits.getString(0)) < strlen(completionLine))
+  {
+    classID = ClassList::StringToID(inputSplits.getString(0));
+    if (classID == CL_NULL)
+      return false;
+    if (inputSplits.getCount()==2)
+      this->objectComplete(inputSplits.getString(1), classID);
+    else
+      this->objectComplete("", classID);
   }
 
@@ -143 +159 @@
     const tList<const char>* classList = this->createCompleteList(clList, classBegin);
     if (classList != NULL)
-      this->generalComplete(classList, classBegin, "%s::", "::");
+      this->generalComplete(classList, classBegin, "CL: %s ");
     else
       return false;
@@ -170 +186 @@
     const tList<const char>* objectList = this->createCompleteList(boList, objectBegin);
     if (objectList != NULL)
-      this->generalComplete(objectList, objectBegin, "%s");
+      this->generalComplete(objectList, objectBegin, "%s", " ");
     else
       return false;
@@ -198 +214 @@
 bool ShellCompletion::generalComplete(const tList<const char>* stringList, const char* begin, const char* displayAs, const char* addBack, const char* addFront)
 {
+  if (stringList == NULL || this->input == NULL )
+    return false;
   if (stringList->getSize() == 0)
     return false;
@@ -214 +232 @@
     for (unsigned int i = inputLenght; i < addLength; i++)
       if (addString[i] != charElem[i])
-    {
-      addLength = i;
-      break;
-    }
+      {
+       addLength = i;
+       break;
+      }
     charElem = charIterator->nextElement();
   }
@@ -233 +251 @@
      this->input->addCharacters(adder);
 
-      if (addBack != NULL && stringList->getSize() == 1)
-       this->input->addCharacters("::");
+      if (stringList->getSize() == 1)
+      {
+        if ( addBack != NULL )
+         this->input->addCharacters(addBack);
+        this->input->addCharacter(' ');
+      }
      delete[] adder;
     }
@@ -263 +285 @@
   while (enumString != NULL)
   {
-    if (strlen(enumString)>searchLength+1 &&
+    if (strlen(enumString) >= searchLength &&
         !strncasecmp(enumString, classNameBegin, searchLength))
     {
+      printf("%s\n", enumString);
       this->completionList->add(enumString);
     }
@@ -296 +319 @@
   {
     if (enumBO->getName() != NULL &&
-        strlen(enumBO->getName())>searchLength+1 &&
+        strlen(enumBO->getName()) >= searchLength &&
         !strncasecmp(enumBO->getName(), classNameBegin, searchLength))
     {

trunk/src/lib/shell/shell_input.h

@@ -22 +22 @@
   virtual ~ShellInput();
 
+  /** @returns the inputLine */
+  const char* getInput() const { return this->inputLine; };
 
   // InputLine