Changeset 5642 in orxonox.OLD for trunk

Timestamp:

Nov 19, 2005, 12:16:12 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: valgrind sweep

Location:

trunk/src/lib

Files:

• lang/base_object.cc (modified) (2 diffs)
• shell/shell_command.cc (modified) (4 diffs)
• shell/shell_command.h (modified) (2 diffs)
• shell/shell_command_class.cc (modified) (1 diff)
• util/executor/executor.h (modified) (2 diffs)
• util/multi_type.cc (modified) (4 diffs)
• util/multi_type.h (modified) (1 diff)

trunk/src/lib/lang/base_object.cc

@@ -151 +151 @@
 /**
  *  displays everything this class is
+ * @TODO REIMPLEMENT WITH SENSE.
  */
 void BaseObject::whatIs() const
@@ -193 +194 @@
       PRINT(0)(" -Weapon-");
     PRINT(0)("\n");
-  }
 }
+}

trunk/src/lib/shell/shell_command.cc

@@ -42 +42 @@
   this->description = NULL;
   this->alias = NULL;
+  this->executor = executor.clone();
 
 //  this->classID = classID;
@@ -47 +48 @@
   if (this->shellClass != NULL)
     this->shellClass->commandList->add(this);
-  // handling parameters, and storing them:
-  if (paramCount > FUNCTOR_MAX_ARGUMENTS)
-    paramCount = FUNCTOR_MAX_ARGUMENTS;
-  this->paramCount = paramCount;
-  this->parameters = new unsigned int[paramCount];
-  this->defaultValue = new MultiType[paramCount];
-
-  this->executor = executor.clone();
 }
 
@@ -62 +55 @@
 ShellCommand::~ShellCommand()
 {
-  delete[] this->parameters;
-  delete[] this->defaultValue;
   if (this->alias != NULL && ShellCommandClass::aliasList != NULL)
   {
@@ -369 +360 @@
     while(elem != NULL)
     {
-      PRINT(0)("  command:'%s' : params:%d: ", elem->getName(), elem->paramCount);
-      for (unsigned int i = 0; i< elem->paramCount; i++)
-       printf("%s ", ShellCommand::paramToString(elem->parameters[i]));
+      PRINT(0)("  command:'%s' : params:%d: ", elem->getName(), elem->executor->getParamCount());
+      /// FIXME
+      /*      for (unsigned int i = 0; i< elem->paramCount; i++)
+       printf("%s ", ShellCommand::paramToString(elem->parameters[i]));*/
       if (elem->description != NULL)
        printf("- %s", elem->description);

trunk/src/lib/shell/shell_command.h

@@ -86 +86 @@
 
   protected:
-    unsigned int                     paramCount;                           //!< the count of parameters.
-    unsigned int*                    parameters;                           //!< Parameters the function of this Command takes.
     MultiType*                       defaultValue;                         //!< Default Values.
 
@@ -95 +93 @@
 
     const char*                      description;                          //!< A description for this commnand. (initially NULL). Assigned with (create)->describe("blablabla");
-    Executor*                        executor;
+    Executor*                        executor;                             //!< The Executor, that really executes the Function.
 
 };

trunk/src/lib/shell/shell_command_class.cc

@@ -238 +238 @@
         while(elem != NULL)
         {
-          PRINT(0)("  command:'%s' : params:%d: ", elem->getName(), elem->paramCount);
-          for (unsigned int i = 0; i< elem->paramCount; i++)
-            PRINT(0)("%s ", ShellCommand::paramToString(elem->parameters[i]));
+          PRINT(0)("  command:'%s' : params:%d: ", elem->getName(), elem->executor->getParamCount());
+          /// FIXME
+          /*          for (unsigned int i = 0; i< elem->paramCount; i++)
+            PRINT(0)("%s ", ShellCommand::paramToString(elem->parameters[i]));*/
           if (elem->description != NULL)
             PRINT(0)("- %s", elem->description);

trunk/src/lib/util/executor/executor.h

@@ -44 +44 @@
     /** @returns the Type of this Function (either static or objective) */
     inline Executor_Type getType() const { return this->functorType; };
+    /** @returns the Count of Parameters this Executor takes */
+    inline unsigned int getParamCount() const { return this->paramCount; };
 
     static void debug();
@@ -54 +56 @@
 
   protected:
-    Executor_Type                    functorType;                          //!< The type of Function we've got (either static or objective).
-    unsigned int                     paramCount;                           //!< the count of parameters.
-    MultiType*                       defaultValue;                         //!< Default Values.
+    Executor_Type                    functorType;      //!< The type of Function we've got (either static or objective).
+    unsigned int                     paramCount;       //!< the count of parameters.
+    MultiType*                       defaultValue;     //!< Default Values.
 };
 

trunk/src/lib/util/multi_type.cc

@@ -96 +96 @@
  * @returns a Copy of itself. (strings inside are copied as well)
  */
-MultiType MultiType::operator= (const MultiType& mt)
-{
-  this->type = mt.type;
-  this->value = mt.value;
-
-  if (mt.type == MT_STRING && mt.storedString != NULL)
-  {
-    this->storedString = new char[strlen (mt.storedString)+1];
-    strcpy(this->storedString, mt.storedString);
-    this->value.String = this->storedString;
-  }
-  else
-    this->storedString = NULL;
-}
+// MultiType MultiType::operator= (const MultiType& mt)
+// {
+//   this->type = mt.type;
+//   this->value = mt.value;
+//
+//   if (mt.type == MT_STRING && mt.storedString != NULL)
+//   {
+//     this->storedString = new char[strlen (mt.storedString)+1];
+//     strcpy(this->storedString, mt.storedString);
+//     this->value.String = this->storedString;
+//   }
+//   else
+//     this->storedString = NULL;
+//   return *this;
+// }
 
 /**
@@ -126 +127 @@
   this->type = (MT_Type)type;
 
+  if (this->type != type)
+  {
+    if (this->type == MT_NULL)
+      this->setString("");
+
+  }
   /// @todo check if this works...
 
@@ -158 +165 @@
   this->type = MT_FLOAT;
   this->value.Float = value;
-
 }
 
@@ -308 +314 @@
     {
       sprintf(tmpString, "%d", this->value.Int);
-      this->storedString = new char[strlen (tmpString)+1];
+      this->storedString = new char[strlen(tmpString)+1];
       strcpy (this->storedString, tmpString);
       return this->storedString;

trunk/src/lib/util/multi_type.h

@@ -42 +42 @@
     virtual ~MultiType();
 
-    MultiType operator= (const MultiType& mt);
+//    MultiType operator= (const MultiType& mt);
 
     void setType(int type);