Changeset 5193 in orxonox.OLD

Timestamp:

Sep 18, 2005, 1:20:36 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: better algorithms

Location:

trunk/src/lib/shell

Files:

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

trunk/src/lib/shell/shell_completion.cc

@@ -71 +71 @@
   SHELLC_TYPE firstType = SHELLC_NONE;
   SHELLC_TYPE secondType = SHELLC_NONE;
+  long completeType = SHELLC_NONE;
+  const char* completeString;
 
 
@@ -91 +93 @@
   }
 
+  // CREATE INPUTS
   if (this->input->getInput() == NULL)
     completionLine = "";
   else
     completionLine = this->input->getInput() + strspn(this->input->getInput(), " \t\n");
-
   SubString inputSplits(completionLine, true);
+
+  // What String will be completed
+  if (emptyComplete == true)
+    completeString = "";
+  else
+    completeString = inputSplits.getString(inputSplits.getCount()-1);
 
   // CLASS COMPLETION
@@ -102 +110 @@
   {
     PRINTF(5)("Listing all Classes\n");
-    this->objectComplete("", CL_SHELL_COMMAND_CLASS);
+    completeType |= SHELLC_CLASS;
   }
   else if (inputSplits.getCount() == 1 && emptyComplete == false)
   {
     printf("trying to complete a Class with '%s'\n", inputSplits.getString(0));
-    this->objectComplete(inputSplits.getString(0), CL_SHELL_COMMAND_CLASS);
+    completeType |= SHELLC_CLASS;
   }
 
@@ -121 +129 @@
     else
     {
-      firstType = SHELLC_CLASS;
-      if (inputSplits.getCount() == 2)
-      {
-        if  (completionLine[strlen(completionLine)-1] != ' ')
-          this->objectComplete(inputSplits.getString(1), classID);
-      }
-      else
-        this->objectComplete("", classID);
-    }
-  }
+      completeType |= SHELLC_OBJECT;
+    }
+  }
+
+  if (completeType & SHELLC_CLASS)
+    this->objectComplete(completeString, CL_SHELL_COMMAND_CLASS);
+  if (completeType & SHELLC_OBJECT)
+    this->objectComplete(completeString, classID);
 
   if (emptyComplete == false)
@@ -168 +174 @@
   if (unlikely(objectBegin == NULL))
     return false;
-  tList<BaseObject>* boList = ClassList::getList(classID);
+  const tList<BaseObject>* boList = ClassList::getList(classID);
   if (boList != NULL)
   {

trunk/src/lib/shell/shell_completion.h

@@ -16 +16 @@
 
 typedef enum {
-  SHELLC_NONE,
-  SHELLC_CLASS,
-  SHELLC_OBJECT,
-  SHELLC_FUNCTION,
-  SHELLC_ALIAS,
+  SHELLC_NONE        = 0,
+  SHELLC_CLASS       = 1,
+  SHELLC_OBJECT      = 2,
+  SHELLC_FUNCTION    = 4,
+  SHELLC_ALIAS       = 8,
 } SHELLC_TYPE;