Changeset 5191 in orxonox.OLD for trunk/src

Timestamp:

Sep 18, 2005, 12:26:35 AM (19 years ago)

Author:

bensch

Message:

oroxnox/trunk: way better algorithm for the completion… more with logic and stuff

File:

• trunk/src/lib/shell/shell_completion.cc (modified) (5 diffs)

trunk/src/lib/shell/shell_completion.cc

@@ -71 +71 @@
 
 
-  PRINTF(4)("AutoComplete on input\n");
+  PRINTF(5)("AutoComplete on input\n");
   this->emptyCompletionList();
 
@@ -83 +83 @@
 
   // Check if we are in a input. eg. the supplied string "class " and now we complete either function or object
-  if (this->input->getInput() == NULL || strlen(this->input->getInput()) == 0 ||
-      (this->input->getInput() != NULL &&
-      strrchr(this->input->getInput(), ' ') >= this->input->getInput() + strlen(this->input->getInput())-1))
+  if (this->input->getInput() != NULL &&
+      strrchr(this->input->getInput(), ' ') >= this->input->getInput() + strlen(this->input->getInput())-1)
   {
     emptyComplete = true;
@@ -91 +90 @@
 
   if (this->input->getInput() == NULL)
-  {
-    return this->objectComplete("", CL_SHELL_COMMAND_CLASS);
-  }
-
-  completionLine = this->input->getInput() + strspn(this->input->getInput(), " \t\n");
+    completionLine = "";
+  else
+    completionLine = this->input->getInput() + strspn(this->input->getInput(), " \t\n");
 
   SubString inputSplits(completionLine, true);
-
 
   // CLASS COMPLETION
@@ -107 +103 @@
     return false;
   }
-  else if (inputSplits.getCount() == 1 && strlen(inputSplits.getString(0)) == strlen(completionLine))
+  else if (inputSplits.getCount() == 1 && emptyComplete == false)
   {
     printf("trying to complete a Class with '%s'\n", inputSplits.getString(0));
@@ -113 +109 @@
   }
 
-  // OBJECT COMPLETIONS
-  else if ( inputSplits.getCount() <= 2 && strlen(inputSplits.getString(0)) < strlen(completionLine))
+  // OBJECT/FUNCTION COMPLETIONS
+  else if ( (inputSplits.getCount() == 1 && emptyComplete == true ) ||
+             (inputSplits.getCount() == 2 && emptyComplete == false))
   {
     classID = ClassList::StringToID(inputSplits.getString(0));