Changeset 5102 in orxonox.OLD for trunk

Timestamp:

Aug 22, 2005, 5:26:29 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: class-autocompletion is nice now

Location:

trunk/src

Files:

• lib/lang/base_object.cc (modified) (2 diffs)
• lib/lang/base_object.h (modified) (1 diff)
• lib/lang/class_list.cc (modified) (3 diffs)
• lib/lang/class_list.h (modified) (1 diff)
• util/loading/load_param.cc (modified) (4 diffs)
• util/loading/load_param.h (modified) (2 diffs)
• util/shell.cc (modified) (3 diffs)
• util/shell.h (modified) (1 diff)

trunk/src/lib/lang/base_object.cc

@@ -52 +52 @@
   //  delete []this->className;
   if (this->objectName)
-    delete []this->objectName;}
+    delete[] this->objectName;}
 
 /**
@@ -84 +84 @@
 {
   if (this->objectName)
-    delete []this->objectName;
+    delete[] this->objectName;
   if (objectName)
   {

trunk/src/lib/lang/base_object.h

@@ -27 +27 @@
 
   void setName (const char* newName);
-  /** \brief returns the Name of this Object */
+  /** returns the Name of this Object */
   inline const char* getName ()const { return this->objectName; };
 

trunk/src/lib/lang/class_list.cc

@@ -109 +109 @@
 }
 
+/**
+ * searches for classID and returns the list of Entities
+ * @param classID the ID of the class to get the list from
+ * @return the List accessed by classID, or NULL if not found
+ */
 tList<BaseObject>* ClassList::getList(long classID)
 {
@@ -119 +124 @@
     {
       if (unlikely(tmpCL->classID == classID))
+        return tmpCL->objectList;
+      tmpCL = tmpCL->next;
+    }
+  }
+  return NULL;
+}
+
+/**
+ * searches for className and returns the list of Entities
+ * @param className the name of the class to get the list from
+ * @return the List accessed by classID, or NULL if not found
+ */tList<BaseObject>* ClassList::getList(const char* className)
+{
+  if(unlikely(ClassList::first == NULL))
+    return NULL;
+  else
+  {
+    ClassList* tmpCL = ClassList::first;
+    while (likely(tmpCL != NULL))
+    {
+      if (unlikely(!strcmp(tmpCL->className, className)))
         return tmpCL->objectList;
       tmpCL = tmpCL->next;
@@ -205 +231 @@
 }
 
-
 /**
  * prints out a string of all the types this Object matches

trunk/src/lib/lang/class_list.h

@@ -39 +39 @@
 
     static tList<BaseObject>* getList(long classID = CL_NULL);
+    static tList<BaseObject>* getList(const char* className);
     static BaseObject*        getObject(const char* name, long classID = CL_NULL);
     static bool               exists(const BaseObject* object, long classID = CL_NULL);

trunk/src/util/loading/load_param.cc

@@ -17 +17 @@
 
 #include "list.h"
-#include "array.h"
 #include "base_object.h"
 
@@ -386 +385 @@
  * searches for classes, which beginn with classNameBegin
  * @param classNameBegin the beginning string of a Class
- * @return a NEW char-array with ClassNames. The ARRAY should be deleted afterwards,
+ * @return a NEW char-array with ClassNames. The LIST should be deleted afterwards,
  * !! The strings MUST NOT be deleted !!
  */
-Array<char*>* LoadClassDescription::searchClassWithShort(const char* classNameBegin)
+tList<const char>* LoadClassDescription::searchClassWithShort(const char* classNameBegin)
 {
   unsigned int searchLength = strlen(classNameBegin);
-  Array<char*>* retVal = new Array<char*>;
+  tList<const char>* retVal = new tList<const char>;
 
   tIterator<LoadClassDescription>* iterator = LoadClassDescription::classList->getIterator();
@@ -401 +400 @@
         !strncasecmp(enumClassDesc->className, classNameBegin, searchLength))
     {
-      retVal->addEntry(enumClassDesc->className);
+      retVal->add(enumClassDesc->className);
     }
     enumClassDesc = iterator->nextElement();
@@ -407 +406 @@
   delete iterator;
 
-  retVal->finalizeArray();
   return retVal;
 }

trunk/src/util/loading/load_param.h

@@ -31 +31 @@
 // Forward Declaration //
 template<class T> class tList;
-template<class T> class Array;
 
 //! macro that makes it even more easy to load a Parameter
@@ -312 +311 @@
 
   static void printAll(const char* fileName = NULL);
-  static Array<char*>* searchClassWithShort(const char* classNameBegin);
+  static tList<const char>* searchClassWithShort(const char* classNameBegin);
 //  static const LoadParamDescription* getClass(const char* className);
 

trunk/src/util/shell.cc

@@ -20 +20 @@
 #include "text_engine.h"
 #include "list.h"
-#include "array.h"
 #include "graphics_engine.h"
 #include "event_handler.h"
@@ -382 +381 @@
   {
     if (this->pressedKey == event.type)
+    {
       this->pressedKey = SDLK_FIRST;
-    this->delayed = 0.0;
+      this->delayed = 0.0;
+    }
   }
 }
@@ -462 +463 @@
   }
 
-  printf("%s\n",commandBegin);
-   Array<char*>* classArray = LoadClassDescription::searchClassWithShort(commandBegin);
-   if (classArray->getCount() == 0)
-   {
-     delete[] completionLine;
-     delete classArray;
+  this->classComplete(commandBegin);
+
+   delete[] completionLine;
+}
+
+/**
+ * autocompletes a className
+ * @param classBegin the Beginning of a String to autoComplete
+ * @return true on success, false otherwise
+ */
+bool Shell::classComplete(const char* classBegin)
+{
+  if (unlikely(classBegin == NULL))
+    return false;
+  tList<const char>* classList = LoadClassDescription::searchClassWithShort(classBegin);
+  if (classList->getSize() == 0)
+  {
+    delete classList;
      //PRINTF(0)("no completion found for %s\n", commandBegin);
-     return false;
-   }
-
-   for (unsigned int i = 0; i < classArray->getCount(); i++)
-   {
-     PRINTF(0)("%s\n", classArray->getEntry(i));
-   }
-   if (classArray->getCount() == 1)
-   {
-     this->removeCharacters(strlen(commandBegin));
-     this->addCharacters(classArray->getEntry(0));
-     this->addCharacter(' ');
-   }
-
-   delete[] completionLine;
-   delete classArray;
-}
+    return false;
+  }
+
+  const char* addString = classList->firstElement();
+  unsigned int addLength = 0;
+  unsigned int inputLenght = strlen(classBegin);
+
+  if (addString != NULL)
+    addLength = strlen(addString);
+  tIterator<const char>* charIterator = classList->getIterator();
+  const char* charElem = charIterator->nextElement();
+  while (charElem != NULL)
+  {
+    PRINTF(0)("%s:: ", charElem);
+    {
+      for (unsigned int i = inputLenght; i < addLength; i++)
+        if (addString[i] != charElem[i])
+      {
+        addLength = i;
+        break;
+      }
+    }
+
+    charElem = charIterator->nextElement();
+  }
+  delete charIterator;
+
+  if (addLength >= inputLenght)
+  {
+    char* adder = new char[addLength+1];
+    strncpy(adder, addString, addLength);
+    adder[addLength] = '\0';
+    this->removeCharacters(inputLenght);
+    this->addCharacters(adder);
+//    this->addCharacters("::");
+    delete[] adder;
+  }
+  delete classList;
+}
+
+bool Shell::objectComplete(const char* objectBegin, ClassID classID)
+{
+
+}
+
+bool Shell::functionComplete(const char* functionBegin)
+{
+}
+
+
 
 /**

trunk/src/util/shell.h

@@ -67 +67 @@
   private:
     bool autoComplete();
+    bool classComplete(const char* classBegin);
+    bool objectComplete(const char* objectBegin, ClassID classID);
+    bool functionComplete(const char* functionBegin);