Changeset 7742 in orxonox.OLD for trunk/src/lib/shell/shell_command_class.cc

Timestamp:

May 20, 2006, 3:53:37 PM (19 years ago)

Author:

bensch

Message:

trying to fix a strange bug of the static initialisation

File:

• trunk/src/lib/shell/shell_command_class.cc (modified) (10 diffs)

trunk/src/lib/shell/shell_command_class.cc

@@ -24 +24 @@
 #include "compiler.h"
 
+
+
 namespace OrxShell
 {
-  std::vector<ShellCommandClass*> ShellCommandClass::commandClassList;
+  CmdClassList ShellCommandClass::commandClassList;
 
   /**
@@ -40 +42 @@
     this->classID = CL_NULL;
 
+    printf("::: %d\n", commandClassList.size());
     ShellCommandClass::commandClassList.push_back(this);
+    printf("::: %d\n", commandClassList.size());
   }
 
@@ -50 +54 @@
     while(!this->commandList.empty())
       delete this->commandList.back();
+    CmdClassList::iterator delClass = std::find(ShellCommandClass::commandClassList.begin(), ShellCommandClass::commandClassList.end(), this);
+    if (delClass != ShellCommandClass::commandClassList.end())
+      ShellCommandClass::commandClassList.erase(delClass);
   }
 
@@ -57 +64 @@
   void ShellCommandClass::registerCommand(ShellCommand* command)
   {
+    printf("::::::::::: ADDED COMMAND:: '%s'\n", command->getName());
     this->commandList.push_back(command);
-  }
-
-  /**
-   * @brief unregister command.
+    this->help();
+  }
+
+  /**
+   * @brief Unregisters a command.
    * @param command the Command to unregister.
    */
   void ShellCommandClass::unregisterCommand(ShellCommand* command)
   {
-    std::vector<ShellCommand*>::iterator delC = std::find(this->commandList.begin(), this->commandList.end(), command);
+    CmdList::iterator delC = std::find(this->commandList.begin(), this->commandList.end(), command);
     if (delC != this->commandList.end())
       this->commandList.erase(delC);
@@ -77 +86 @@
   {
     // unregister all commands and Classes
-    std::vector<ShellCommandClass*>::iterator classIT;
-    for (classIT = ShellCommandClass::commandClassList.begin(); classIT != ShellCommandClass::commandClassList.end(); classIT++)
-      delete (*classIT);
+    CmdClassList::iterator classIT;
+
+    while (!ShellCommandClass::commandClassList.empty())
+      delete ShellCommandClass::commandClassList.back();
   }
 
@@ -91 +101 @@
   bool ShellCommandClass::getCommandListOfClass(const std::string& className, std::list<std::string>& stringList)
   {
-    std::vector<ShellCommandClass*>::iterator elem;
+    CmdClassList::const_iterator elem;
     for(elem = ShellCommandClass::commandClassList.begin(); elem != ShellCommandClass::commandClassList.end(); elem++)
     {
       if (className == (*elem)->getName())
       {
-        std::vector<ShellCommand*>::iterator command;
+        CmdList::iterator command;
         for(command = (*elem)->commandList.begin(); command != (*elem)->commandList.end(); command++)
           stringList.push_back((*command)->getName());
+        return true;
       }
     }
-    return true;
+    return false;
   }
 
@@ -110 +121 @@
    * @returns the CommandClass if found, NULL otherwise
    */
-  const ShellCommandClass* ShellCommandClass::getCommandClass(const std::string& className)
-  {
-    std::vector<ShellCommandClass*>::const_iterator classIT;
+  ShellCommandClass* ShellCommandClass::getCommandClass(const std::string& className)
+  {
+    CmdClassList::const_iterator classIT;
     for (classIT = ShellCommandClass::commandClassList.begin(); classIT != ShellCommandClass::commandClassList.end(); classIT++)
       if (className == (*classIT)->className)
@@ -144 +155 @@
   ShellCommandClass* ShellCommandClass::acquireCommandClass(const std::string& className)
   {
-    std::vector<ShellCommandClass*>::iterator classIT;
-    for (classIT = ShellCommandClass::commandClassList.begin(); classIT != ShellCommandClass::commandClassList.end(); classIT++)
-      if (className == (*classIT)->className)
-        return (*classIT);
+    ShellCommandClass* cmdClass = ShellCommandClass::getCommandClass(className);
+    if (cmdClass != NULL)
+      return (cmdClass);
     return new ShellCommandClass(className);
   }
@@ -157 +167 @@
   void ShellCommandClass::help(const std::string& className)
   {
-    std::vector<ShellCommandClass*>::iterator classIT;
+    if (className.empty())
+      PRINT(0)("===== Displaying %d registered Classes:\n", ShellCommandClass::commandClassList.size());
+
+
+    CmdClassList::iterator classIT;
     for (classIT = ShellCommandClass::commandClassList.begin(); classIT != ShellCommandClass::commandClassList.end(); classIT++)
     {
-      if (className == (*classIT)->className)
+      if (className.empty() || className == (*classIT)->className)
       {
         PRINT(0)("Class:'%s' registered %d commands: \n", (*classIT)->className.c_str(), (*classIT)->commandList.size());
-        std::vector<ShellCommand*>::const_iterator cmdIT;
+        CmdList::const_iterator cmdIT;
         for (cmdIT = (*classIT)->commandList.begin(); cmdIT != (*classIT)->commandList.end(); cmdIT++)
         {
@@ -174 +188 @@
           PRINT(0)("\n");
         }
-        return;
+        if (likely(!className.empty()))
+          return;
       }
     }
-    PRINTF(3)("Class %s not found in Command's classes\n", className.c_str());
-  }
-
+    PRINTF(3)("Class '%s' not found in Command's classes\n", className.c_str());
+  }
 }