Changeset 7199 in orxonox.OLD for trunk/src/lib/util/executor

Timestamp:

Mar 8, 2006, 10:46:37 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: MultiType rework (now uses std::string) this is more compliant, and better to handle

Location:

trunk/src/lib/util/executor

Files:

• executor.cc (modified) (4 diffs)
• executor.h (modified) (2 diffs)
• functor_list.h (modified) (5 diffs)

trunk/src/lib/util/executor/executor.cc

@@ -45 +45 @@
   this->setClassID(CL_EXECUTOR, "Executor");
 
-
   // What Parameters have we got
   this->defaultValue[0] = param0;
@@ -53 +52 @@
   this->defaultValue[4] = param4;
 
+  this->paramCount = 0;
   for (unsigned int i = 0; i < FUNCTOR_MAX_ARGUMENTS; i++)
   {
@@ -61 +61 @@
     }
   }
-  assert (paramCount <= FUNCTOR_MAX_ARGUMENTS);
 }
 
@@ -109 +108 @@
   {
     if (*value[i] != MT_NULL)
-    {
-      if (this->defaultValue[i].getType() == value[i]->getType())
-      {
-        this->defaultValue[i] = *value[i];
-      }
-      else
-      {
-        PRINTF(1)("Unable to set this Value, as it is not of type %s\n", MultiType::MultiTypeToString(this->defaultValue[i].getType()));
-      }
-    }
+        this->defaultValue[i].setValueOf(*value[i]);
   }
   return this;

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

@@ -13 +13 @@
 #include "substring.h"
 #include "functor_list.h" //< MUST BE INCLUDED HERE AT LEAST ONCE.
-
-#include <stdarg.h>
 
 //! an enumerator for the definition of the Type.
@@ -89 +87 @@
 #define   l_FLOAT_DEFGRAB(i)        this->defaultValue[i].getFloat()
 //! where to chek for default STRING values
-#define   l_STRING_DEFGRAB(i)       this->defaultValue[i].getString()
+#define   l_CSTRING_DEFGRAB(i)      this->defaultValue[i].getCString()
 
 //////////////////////////

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

@@ -21 +21 @@
    l_SHORT:     short
    l_FLOAT:     float
-   l_STRING:    const char*
+   l_CSTRING:    const char*
    l_XML_ELEM:  TiXmlElement*
  */
@@ -60 +60 @@
 // #define l_SHORT_FUNC       atoi                 //!< The function to parse a SHORT
 // #define l_SHORT_NAME       "short"              //!< The name of a SHORT
-//#define l_SHORT_PARAM       ParameterShort       //!< the type of the parameter SHORT
+// #define l_SHORT_PARAM      ParameterShort       //!< the type of the parameter SHORT
 // #define l_SHORT_DEFAULT    0                    //!< a default Value for a SHORT
 
@@ -74 +74 @@
 //#define l_VECTOR_DEFAULT   Vector(0,0,0)        //!< Default value for a VECTOR
 
-#define l_STRING_TYPE      const char*          //!< The type of a STRING
+#define l_CSTRING_TYPE     const char*          //!< The type of a STRING
+#define l_CSTRING_FUNC     isString             //!< The function to parse a STRING
+#define l_CSTRING_NAME     "string"             //!< The name of a STRING
+#define l_CSTRING_PARAM    MT_STRING            //!< the type of the parameter STRING
+#define l_CSTRING_DEFAULT  ""                   //!< a default Value for an STRING
+
+#define l_STRING_TYPE      const std::string&   //!< The type of a STRING
 #define l_STRING_FUNC      isString             //!< The function to parse a STRING
 #define l_STRING_NAME      "string"             //!< The name of a STRING
@@ -93 +99 @@
   FUNCTOR_LIST(0)();
   //! makes functions with one string
-  FUNCTOR_LIST(1)(l_STRING);
+  FUNCTOR_LIST(1)(l_CSTRING);
   //! makes functions with two strings
-  FUNCTOR_LIST(2)(l_STRING, l_STRING);
+  FUNCTOR_LIST(2)(l_CSTRING, l_CSTRING);
   //! makes functions with three strings
-  FUNCTOR_LIST(3)(l_STRING, l_STRING, l_STRING);
+  FUNCTOR_LIST(3)(l_CSTRING, l_CSTRING, l_CSTRING);
   //! makes functions with four strings
-  FUNCTOR_LIST(4)(l_STRING, l_STRING, l_STRING, l_STRING);
+  FUNCTOR_LIST(4)(l_CSTRING, l_CSTRING, l_CSTRING, l_CSTRING);
 
   //! makes functions with one bool
@@ -135 +141 @@
 
   //! mixed values:
-  FUNCTOR_LIST(2)(l_STRING, l_FLOAT);
+  FUNCTOR_LIST(2)(l_CSTRING, l_FLOAT);
   FUNCTOR_LIST(2)(l_UINT, l_LONG);
-  FUNCTOR_LIST(2)(l_STRING, l_UINT);
+  FUNCTOR_LIST(2)(l_CSTRING, l_UINT);
 
-  FUNCTOR_LIST(3)(l_STRING, l_FLOAT, l_UINT);
+  FUNCTOR_LIST(3)(l_CSTRING, l_FLOAT, l_UINT);