Changeset 7403 in orxonox.OLD for trunk/src/lib/shell/shell_completion.cc

Timestamp:

Apr 27, 2006, 5:49:12 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: more exists functions to ClassList, and improved shellcompletion

File:

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

trunk/src/lib/shell/shell_completion.cc

@@ -51 +51 @@
   bool ShellCompletion::autoComplete(std::string& input)
   {
-    long classID;                               //< the classID retrieved from the Class.
-    const std::list<BaseObject*>* objectList;   //< the list of Objects stored in classID
+    long classID = CL_NULL;                     //< the classID retrieved from the Class.
+    const std::list<BaseObject*>* objectList;   //< the list of Objects stored in classID's ClassList
     bool emptyComplete = false;                 //< if the completion input is empty string. e.g ""
     long completeType = NullCompletion;         //< the Type we'd like to complete.
-    std::string completeString;                 //< the string to complete.
+    std::string completeString = "";            //< the string to complete.
 
 
@@ -62 +62 @@
 
     // Check if we are in a input. eg. the supplied string "class " and now we complete either function or object
-    if (input[input.size()-1] == ' ')
+    if (input.empty() || input[input.size()-1] == ' ')
       emptyComplete = true;
 
@@ -69 +69 @@
 
     // What String will be completed
-    if (emptyComplete == true)
-      completeString = "";
-    else
+    if (!emptyComplete && inputSplits.size() >= 1)
       completeString = inputSplits.getString(inputSplits.size()-1);
 
-    // CLASS COMPLETION
-    if (inputSplits.size() == 0)
+    // CLASS/ALIAS COMPLETION (on first argument)
+    if (inputSplits.size() == 0 || (!emptyComplete && inputSplits.size() == 1))
     {
       completeType |= ClassCompletion;
       completeType |= AliasCompletion;
     }
-    else if (inputSplits.size() == 1 && emptyComplete == false)
-    {
-      completeType |= ClassCompletion;
-      completeType |= AliasCompletion;
-    }
 
     // OBJECT/FUNCTION COMPLETIONS
-    else if ((inputSplits.size() == 1 && emptyComplete == true) ||
-             (inputSplits.size() == 2 && emptyComplete == false))
+    else if ((emptyComplete && inputSplits.size() == 1) ||
+              (!emptyComplete && inputSplits.size() == 2))
     {
       classID = ClassList::StringToID(inputSplits.getString(0));
@@ -94 +87 @@
       if (classID != CL_NULL)
         completeType |= ObjectCompletion;
-      //if (objectList != NULL && objectList->getSize() == 1)
       completeType |= FunctionCompletion;
     }
-    else if ((inputSplits.size() == 2 && emptyComplete == true) ||
-             (inputSplits.size() == 3 && emptyComplete == false))
-    {
-      classID = ClassList::StringToID(inputSplits.getString(0));
-      if (classID == CL_NULL)
-        return false;
-      else
+    else if ((emptyComplete && inputSplits.size() == 2 ) ||
+             (!emptyComplete && inputSplits.size() == 3))
+    {
+      if (ClassList::exists(inputSplits[0], inputSplits[1]))
         completeType |= FunctionCompletion;
     }