Changeset 5780 in orxonox.OLD for trunk

Timestamp:

Nov 26, 2005, 3:47:51 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: no more segfault in the Shell

Location:

trunk/src/lib

Files:

• graphics/text_engine/text_engine.cc (modified) (2 diffs)
• lang/class_list.cc (modified) (1 diff)
• shell/shell_command_class.cc (modified) (3 diffs)
• shell/shell_completion.cc (modified) (9 diffs)
• shell/shell_completion.h (modified) (1 diff)

trunk/src/lib/graphics/text_engine/text_engine.cc

@@ -68 +68 @@
   {
     while(textList->size() > 0)
-    {
       delete dynamic_cast<Text*>(textList->front());
-    }
   }
   // delete all remaining fonts (There should not be Anything to do here)
@@ -76 +74 @@
   if (fontList != NULL)
   {
+    ///FIXME
 //    while (fontList->size() > 0)
     {
-      Font* font = dynamic_cast<Font*>(fontList->front());
+      Font* font = dynamic_cast<Font*>(fontList->back());
       if (likely(font != Font::getDefaultFont()))
         ResourceManager::getInstance()->unload(font, RP_GAME);

trunk/src/lib/lang/class_list.cc

@@ -49 +49 @@
 ClassList::~ClassList ()
 {
-  /// FIXME
-//   if(ClassList::classList != NULL)
-//   {
-//     delete ClassList::classList;
-//     ClassList::classList = NULL;
-//   }
-  --ClassList::classCount;
+//   ClassList::classList.erase(ClassList::classList.begin(), ClassList::classList.end());
+   --ClassList::classCount;
 }
 

trunk/src/lib/shell/shell_command_class.cc

@@ -20 +20 @@
 #include "shell_command.h"
 
-#include "list.h"
 #include "debug.h"
 #include "class_list.h"
+#include "compiler.h"
 
 #include <stdio.h>
@@ -104 +104 @@
 void ShellCommandClass::unregisterAllCommands()
 {
-  /// FIXME
-
-  /*  if (ShellCommandClass::commandClassList != NULL)
-  {
-    // unregister all commands
-    tIterator<ShellCommandClass>* iterator = ShellCommandClass::commandClassList->getIterator();
-    ShellCommandClass* elem = iterator->firstElement();
-    while(elem != NULL)
-    {
-      delete elem;
-
-      elem = iterator->nextElement();
-    }
-    delete iterator;
-
+   if (ShellCommandClass::commandClassList != NULL)
+  {
+    // unregister all commands and Classes
+    std::list<ShellCommandClass*>::iterator classIT;
+    for (classIT = ShellCommandClass::commandClassList->begin(); classIT != ShellCommandClass::commandClassList->end(); classIT++)
+      delete (*classIT);
     delete ShellCommandClass::commandClassList;
     ShellCommandClass::commandClassList = NULL;
@@ -126 +117 @@
   if (ShellCommandClass::aliasList != NULL)
   {
-    tIterator<ShellCommandAlias>* itAL = ShellCommandClass::aliasList->getIterator();
-    ShellCommandAlias* elemAL = itAL->firstElement();
-    while(elemAL != NULL)
-    {
-      delete elemAL;
-      elemAL = itAL->nextElement();
-    }
-    delete itAL;
+    std::list<ShellCommandAlias*>::iterator alias;
+    for (alias = ShellCommandClass::aliasList->begin(); alias != ShellCommandClass::aliasList->end(); alias++)
+      delete (*alias);
     delete ShellCommandClass::aliasList;
     ShellCommandClass::aliasList = NULL;
-  }*/
+  }
 }
 

trunk/src/lib/shell/shell_completion.cc

@@ -25 +25 @@
 #include "base_object.h"
 #include "class_list.h"
-#include "list.h"
 #include "debug.h"
 
@@ -37 +36 @@
 ShellCompletion::ShellCompletion(ShellInput* input)
 {
-  this->completionList = NULL;
   this->input = input;
 }
@@ -47 +45 @@
 ShellCompletion::~ShellCompletion ()
 {
-  // delete what has to be deleted here
-  if (this->completionList)
-  {
-    this->emptyCompletionList();
-    delete this->completionList;
-  }
 }
 
@@ -239 +231 @@
 bool ShellCompletion::generalComplete(const char* begin, const char* displayAs, const char* addBack, const char* addFront)
 {
-  if (completionList == NULL || this->input == NULL )
-    return false;
-  if (completionList->size() == 0)
-    return false;
-
-  ShellC_Element* addElem = completionList->front();
-  const char* addString = addElem->name;
+  if (this->input == NULL )
+    return false;
+  if (completionList.size() == 0)
+    return false;
+
+  ShellC_Element addElem = completionList.front();
+  const char* addString = addElem.name;
   unsigned int addLength = 0;
   unsigned int inputLenght = strlen(begin);
@@ -254 +246 @@
 
   SHELLC_TYPE changeType = SHELLC_NONE;
-  list<ShellC_Element*>::iterator charIT;
-  for (charIT = completionList->begin(); charIT != completionList->end(); charIT++)
-  {
-    if ((*charIT)->type != changeType)
+  list<ShellC_Element>::iterator charIT;
+  for (charIT = completionList.begin(); charIT != completionList.end(); charIT++)
+  {
+    if ((*charIT).type != changeType)
     {
       if (changeType != SHELLC_NONE)
         PRINT(0)("\n");
-      PRINT(0)("%s: ", ShellCompletion::typeToString((*charIT)->type));
-      changeType = (*charIT)->type;
+      PRINT(0)("%s: ", ShellCompletion::typeToString((*charIT).type));
+      changeType = (*charIT).type;
     }
-    PRINTF(0)("%s ", (*charIT)->name);
+    PRINTF(0)("%s ", (*charIT).name);
     for (unsigned int i = inputLenght; i < addLength; i++)
-      if (addString[i] != (*charIT)->name[i])
+      if (addString[i] != (*charIT).name[i])
       {
        addLength = i;
@@ -285 +277 @@
      this->input->addCharacters(adder);
 
-      if (completionList->size() == 1)
+      if (completionList.size() == 1)
       {
         if ( addBack != NULL )
@@ -315 +307 @@
         !strncasecmp(*string, completionBegin, searchLength))
     {
-      printf("%s\n", *string);
-      ShellC_Element* newElem = new ShellC_Element;
-      newElem->name = *string;
-      newElem->type = type;
-      this->completionList->push_back(newElem);
+      ShellC_Element newElem;
+      newElem.name = *string;
+      newElem.type = type;
+      this->completionList.push_back(newElem);
     }
   }
@@ -344 +335 @@
         !strncasecmp((*bo)->getName(), completionBegin, searchLength))
     {
-      ShellC_Element* newElem = new ShellC_Element;
-      newElem->name = (*bo)->getName();
-      newElem->type = type;
-      this->completionList->push_back(newElem);
+      ShellC_Element newElem;
+      newElem.name = (*bo)->getName();
+      newElem.type = type;
+      this->completionList.push_back(newElem);
     }
   }
@@ -361 +352 @@
 void ShellCompletion::emptyCompletionList()
 {
-  if (this->completionList != NULL)
-  {
-    while (this->completionList->size() > 0)
-    {
-      delete this->completionList->front();
-      this->completionList->pop_front();
-    }
-  }
+  this->completionList.erase(this->completionList.begin(),
+                             this->completionList.end());
 }
 

trunk/src/lib/shell/shell_completion.h

@@ -60 +60 @@
 
  private:
-   std::list<ShellC_Element*>*  completionList;          //!< A list of completions, that are io.
+   std::list<ShellC_Element>    completionList;          //!< A list of completions, that are io.
    ShellInput*                  input;                   //!< the input this completion works on.
 };