Changeset 5103 in orxonox.OLD for trunk/src/util/shell.cc

Timestamp:

Aug 22, 2005, 6:08:15 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: better algorithm to find the ClassName.
Now this is done via the ClassList

File:

• trunk/src/util/shell.cc (modified) (8 diffs)

trunk/src/util/shell.cc

@@ -24 +24 @@
 
 #include "load_param.h"
+#include "class_list.h"
 #include "debug.h"
 #include <stdarg.h>
@@ -59 +60 @@
   this->inputLineText->setParent2D(this);
 
+  this->completionList = NULL;
 
   EventHandler* evh = EventHandler::getInstance();
@@ -91 +93 @@
   }
   delete charIterator;
+
+//  if (this->completionList != NULL)
+    //delete this->completionList;
 
   Shell::singletonRef = NULL;
@@ -465 +470 @@
   this->classComplete(commandBegin);
 
-   delete[] completionLine;
+  delete[] completionLine;
 }
 
@@ -477 +482 @@
   if (unlikely(classBegin == NULL))
     return false;
-  tList<const char>* classList = LoadClassDescription::searchClassWithShort(classBegin);
+  const tList<const char>* classList = this->searchClassWithShort(classBegin);
   if (classList->getSize() == 0)
   {
-    delete classList;
      //PRINTF(0)("no completion found for %s\n", commandBegin);
     return false;
@@ -519 +523 @@
     delete[] adder;
   }
-  delete classList;
 }
 
@@ -529 +532 @@
 bool Shell::functionComplete(const char* functionBegin)
 {
+}
+
+
+/**
+ * searches for classes, which beginn with classNameBegin
+ * @param classNameBegin the beginning string of a Class
+ * @return a NEW char-array with ClassNames. The LIST should be deleted afterwards,
+ * !! The strings MUST NOT be deleted !!
+ */
+const tList<const char>* Shell::searchClassWithShort(const char* classNameBegin)
+{
+  unsigned int searchLength = strlen(classNameBegin);
+  if (this->completionList != NULL)
+    delete this->completionList;
+  this->completionList = new tList<const char>;
+
+//  tList<const char>* classList = ClassList::getClassList();
+
+  tIterator<const char>* iterator = ClassList::getClassList()->getIterator();
+  const char* enumString = iterator->nextElement();
+  while (enumString != NULL)
+  {
+    if (strlen(enumString)>searchLength+1 &&
+        !strncasecmp(enumString, classNameBegin, searchLength))
+    {
+      this->completionList->add(enumString);
+    }
+    enumString = iterator->nextElement();
+  }
+  delete iterator;
+
+  return this->completionList;
 }
 
@@ -540 +575 @@
   if (this->pressedKey != SDLK_FIRST)
     printf("%s::%f %f\n", SDLKToKeyname(this->pressedKey), this->delayed, this->repeatDelay);
-
-}
+}