Changeset 5141 in orxonox.OLD for trunk/src/util

Timestamp:

Aug 26, 2005, 4:04:53 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: moved helper-functions to helper-functions.cc

Location:

trunk/src/util

Files:

• loading/load_param.cc (modified) (1 diff)
• loading/load_param.h (modified) (2 diffs)
• shell.cc (modified) (1 diff)
• shell.h (modified) (2 diffs)
• shell_command.cc (modified) (5 diffs)
• shell_command.h (modified) (6 diffs)

trunk/src/util/loading/load_param.cc

@@ -112 +112 @@
   }
 }
-
-/**
- * checks if the input was a Bool
- * @param BOOL a String that holds a bool: must be one of those: 1,0,true,false,TRUE,FALSE
- * @param defaultValue a default value that is set, if BOOL is corrupt
- * @return returns the bool, if BOOL was correct otherwise defaultValue
- */
-bool isBool(const char* BOOL, bool defaultValue)
-{
-  if(!strcmp(BOOL, "1") || !strcmp( BOOL,"true") || !strcmp(BOOL,"TRUE"))
-    return true;
-  else if (!strcmp(BOOL, "0") || !strcmp( BOOL,"false") || !strcmp(BOOL,"FALSE"))
-    return false;
-  else
-    return defaultValue;
-
-}
-
-int isInt(const char* INT, int defaultValue)
-{
-  char* endPtr = NULL;
-  int result = strtol(INT, &endPtr, 10);
-
-  if ( endPtr >= INT && endPtr < INT + strlen(INT))
-    return defaultValue;
-  else
-    return result;
-}
-
-float isFloat(const char* FLOAT, float defaultValue)
-{
-  char* endPtr = NULL;
-  double result = strtod(FLOAT, &endPtr);
-
-  if ( endPtr >= FLOAT && endPtr < FLOAT + strlen(FLOAT))
-    return defaultValue;
-  else
-    return result;
-}
-
-const Vector& isVector(const char* VECTOR, const Vector& defaultValue)
-{
-
-
-}
-
-const char* isString(const char* STRING, const char* defaultValue)
-{
-  if (STRING != NULL)
-    return STRING;
-  else
-    return defaultValue;
-}
-
 
 /**

trunk/src/util/loading/load_param.h

@@ -28 +28 @@
 #include "substring.h"
 #include "tinyxml.h"
+#include "helper_functions.h"
 
 // Forward Declaration //
@@ -216 +217 @@
         PRINTF(4)("Not loaded parameter %s of %s\n", paramName, pt2Object->getClassName()); \
 }
-
-
-/***********************
-*** HELPER FUNCTIONS ***
-***********************/
-bool          isBool(const char* BOOL, bool defaultValue);
-int           isInt(const char* INT, int defaultValue);
-float         isFloat(const char* FLOAT, float defaultValue);
-//const Vector& isVector(const char* VECTOR, const Vector& defaultValue);
-const char*   isString(const char* STRING, const char* defaultValue);
-
-//TiXmlEmlemnt* isXmlElem(const)
-
 
 /************************

trunk/src/util/shell.cc

@@ -494 +494 @@
   if (event.bPressed)
   {
-    PRINTF(4)("Shell received command %s\n", SDLKToKeyname(event.type));
+    PRINTF(5)("Shell received command %s\n", SDLKToKeyname(event.type));
     if (event.type == SDLK_BACKQUOTE)
     {

trunk/src/util/shell.h

@@ -16 +16 @@
 // FORWARD DECLARATION
 class Text;
+class ShellCommandBase;
 template<class T> class tList;
 template<class T> class tIterator;
@@ -85 +86 @@
     const tList<const char>* createCompleteList(const tList<const char>* inputList, const char* classNameBegin);
     const tList<const char>* createCompleteList(const tList<BaseObject>* inputList, const char* classNameBegin);
+    const tList<const char>* createCompleteList(const tList<ShellCommandBase>* inputList, const char* classNameBegin);
 
     // helpers //

trunk/src/util/shell_command.cc

@@ -30 +30 @@
 ShellCommandBase::ShellCommandBase(const char* commandName, ClassID classID, unsigned int paramCount, ...)
 {
+  this->setClassID(CL_SHELL_COMMAND, "ShellCommand");
+  this->setName(commandName);
+
   va_list parameters;
   va_start(parameters, paramCount);
 
   this->classID = classID;
+  this->className = ClassList::IDToString(classID);
+
   if (classID & CL_MASK_SINGLETON == CL_MASK_SINGLETON)
     this->isSingleton = true;
   else
     this->isSingleton = false;
-
-  this->commandName = new char[strlen(commandName)+1];
-  strcpy(this->commandName, commandName);
 
   // handling parameters, and storing them:
@@ -55 +57 @@
 ShellCommandBase::~ShellCommandBase()
 {
-  delete[] this->commandName;
   delete[] this->parameters;
 }
@@ -78 +79 @@
   while(elem != NULL)
   {
-    if (classID == elem->classID && !strcmp(commandName, elem->commandName))
+    if (classID == elem->classID && !strcmp(commandName, elem->getName()))
     {
       PRINTF(2)("Command already registered\n");
@@ -104 +105 @@
   while(elem != NULL)
   {
-    printf("%s\n", elem->commandName);
-    if (!strncmp(executionString, elem->commandName, strlen(elem->commandName)))
+    printf("%s\n", elem->getName());
+    if (!strncmp(executionString, elem->getName(), strlen(elem->getName())))
     {
       elem->executeCommand(commandEnd);
@@ -116 +117 @@
   return true;
 }
-

trunk/src/util/shell_command.h

@@ -8 +8 @@
 
 #include "base_object.h"
+
+#include "helper_functions.h"
 
 #include <stdarg.h>
@@ -44 +46 @@
 
 
+
 ////////////////
 // BASE CLASS //
@@ -53 +56 @@
     static bool execute (const char* executionString);
 
-    virtual void executeCommand (const char* parameters) = NULL;
+    static const tList<ShellCommandBase>* getCommandList() { return ShellCommandBase::commandList; };
+
 
   protected:
@@ -60 +64 @@
 
     static bool isRegistered(const char* commandName, ClassID classID, unsigned int paramCount, ...);
+
+  private:
+    virtual void executeCommand (const char* parameters) = NULL;
 
   protected:
@@ -68 +75 @@
 
   private:
-    char*                            commandName;         //!< The name of the Command when executed
-    long                             classID;             //!< The ID of the Class asociated to this Command
+    long                             classID;             //!< The ID of the Class associated to this Command
+    const char*                      className;           //!< The Name of the Class associated to this Command
 
     // STATIC MEMBERS
@@ -133 +140 @@
 #define FUNCTOR_LIST(x) ShellCommand ## x
 //#include "functor_list.h"
-//ShellCommand2(l_INT, l_INT);
+//FUNCTOR_LIST(2)(l_INT, l_INT);
 #undef FUNCTOR_LIST
 
-  private:
-//    T*                   objectPointer;       //!< The pointer to the object to apply this function to (NULL if classID == CL_NULL )
 };