Changeset 7203 in orxonox.OLD for branches/std/src/lib/util/executor

Timestamp:

Mar 9, 2006, 5:28:10 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: compiles again, BUT well…. i do not expect it to run anymore

Location:

branches/std/src/lib/util/executor

Files:

• executor.cc (modified) (1 diff)
• executor.h (modified) (2 diffs)
• functor_list.h (modified) (2 diffs)

branches/std/src/lib/util/executor/executor.cc

@@ -105 +105 @@
   value[4] = &value4;
 
-  printf("%s ::: paramCount: %d\n", this->getName(), this->paramCount);
   for (unsigned int i = 0; i < this->paramCount; i++)
   {
     if (*value[i] != MT_NULL)
     {
-      printf("1:::: %d : %s \n",i, MultiType::MultiTypeToString(this->defaultValue[i].getType()));
-
-      this->defaultValue[i].debug();
-      //this->defaultValue[i].setValueOf(*value[i]);
-      //printf("2::::%s\n", MultiType::MultiTypeToString(this->defaultValue[i].getType()));
-      //this->defaultValue[i].debug();
-    //this->defaultValue[i].setValueOf(*value[i]);
+      this->defaultValue[i].setValueOf(*value[i]);
     }
   }

branches/std/src/lib/util/executor/executor.h

@@ -87 +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()
+//! where to chek for default CSTRING values
 #define   l_CSTRING_DEFGRAB(i)      this->defaultValue[i].getCString()
 
@@ -268 +270 @@
     virtual void execute (BaseObject* object, const void* parameters = NULL)
     {
-      SubString sub((const char*) parameters, " \n\t,", '\\');
-      printf("%s :: %s\n", this->getName(), (const char*) parameters);
+      SubString sub(((const std::string*) parameters)->c_str(), " \n\t,", '\\');
+      printf("%s :: %s\n", this->getName(), ((const std::string*) parameters)->c_str());
 //! FUNCTOR_LIST is the List of Executive Functions
 #define FUNCTOR_LIST(x) ExecutorExecute ## x

branches/std/src/lib/util/executor/functor_list.h

@@ -75 +75 @@
 
 #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_FUNC     isCString            //!< The function to parse a STRING
+#define l_CSTRING_NAME     "cstring"            //!< 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
@@ -98 +98 @@
 
   FUNCTOR_LIST(0)();
+  //! makes functions with one cstring
+  FUNCTOR_LIST(1)(l_CSTRING);
+  //! makes functions with two cstrings
+  FUNCTOR_LIST(2)(l_CSTRING, l_CSTRING);
+  //! makes functions with three cstrings
+  FUNCTOR_LIST(3)(l_CSTRING, l_CSTRING, l_CSTRING);
+  //! makes functions with four cstrings
+  FUNCTOR_LIST(4)(l_CSTRING, l_CSTRING, l_CSTRING, l_CSTRING);
+
   //! makes functions with one string
-  FUNCTOR_LIST(1)(l_CSTRING);
+  FUNCTOR_LIST(1)(l_STRING);
   //! makes functions with two strings
-  FUNCTOR_LIST(2)(l_CSTRING, l_CSTRING);
+  FUNCTOR_LIST(2)(l_STRING, l_STRING);
   //! makes functions with three strings
-  FUNCTOR_LIST(3)(l_CSTRING, l_CSTRING, l_CSTRING);
+  FUNCTOR_LIST(3)(l_STRING, l_STRING, l_STRING);
   //! makes functions with four strings
-  FUNCTOR_LIST(4)(l_CSTRING, l_CSTRING, l_CSTRING, l_CSTRING);
+  FUNCTOR_LIST(4)(l_STRING, l_STRING, l_STRING, l_STRING);
+
 
   //! makes functions with one bool