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

Timestamp:

Mar 9, 2006, 2:43:47 AM (18 years ago)

Author:

bensch

Message:

orxonox/truink: minor cleanup

Location:

trunk/src/lib/util/executor

Files:

• executor.cc (modified) (1 diff)
• executor.h (modified) (3 diffs)

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

@@ -108 +108 @@
   {
     if (*value[i] != MT_NULL)
-        this->defaultValue[i].setValueOf(*value[i]);
+    {
+     // printf("1:::: %s\n", 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]);
+    }
   }
   return this;

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

@@ -189 +189 @@
 //! execute-macro for functions with one parameter
 #define ExecutorExecute1(t1) \
-   else if (this->paramCount == 1 && this->defaultValue[0].getType() == t1##_PARAM) \
+   else if (this->paramCount == 1 && this->defaultValue[0] == t1##_PARAM) \
     EXECUTOREXECUTER(_1_##t1)(t1##_FUNC((const char*)parameters, t1##_DEFGRAB(0)))
 
 //! execute-macro for functions with two parameters
 #define ExecutorExecute2(t1,t2) \
-   else if (this->paramCount == 2 && this->defaultValue[0].getType() == t1##_PARAM && this->defaultValue[1].getType() == t2##_PARAM) \
+   else if (this->paramCount == 2 && this->defaultValue[0] == t1##_PARAM && this->defaultValue[1] == t2##_PARAM) \
     EXECUTOREXECUTER(_2_##t1##_##t2)(t1##_FUNC(sub.getString(0), t1##_DEFGRAB(0)), t2##_FUNC(sub.getString(1), t2##_DEFGRAB(1)))
 
 //! execute-macro for functions with three parameters
 #define ExecutorExecute3(t1,t2,t3) \
-   else if (this->paramCount == 3 && this->defaultValue[0].getType() == t1##_PARAM && this->defaultValue[1].getType() == t2##_PARAM && this->defaultValue[2].getType() == t3##_PARAM) \
+   else if (this->paramCount == 3 && this->defaultValue[0] == t1##_PARAM && this->defaultValue[1] == t2##_PARAM && this->defaultValue[2] == t3##_PARAM) \
     EXECUTOREXECUTER(_3_##t1##_##t2##_##t3)(t1##_FUNC(sub.getString(0), t1##_DEFGRAB(0)), t2##_FUNC(sub.getString(1), t2##_DEFGRAB(1)), t3##_FUNC(sub.getString(2), t3##_DEFGRAB(2)))
 
 //! execute-macro for functions with four parameters
 #define ExecutorExecute4(t1,t2,t3,t4) \
-   else if (this->paramCount == 4 && this->defaultValue[0].getType() == t1##_PARAM && this->defaultValue[1].getType() == t2##_PARAM && this->defaultValue[2].getType() == t3##_PARAM && this->defaultValue[3].getType() == t4##_PARAM) \
+   else if (this->paramCount == 4 && this->defaultValue[0] == t1##_PARAM && this->defaultValue[1] == t2##_PARAM && this->defaultValue[2] == t3##_PARAM && this->defaultValue[3] == t4##_PARAM) \
     EXECUTOREXECUTER(_4_##t1##_##t2##_##t3##_##t4)(t1##_FUNC(sub.getString(0), t1##_DEFGRAB(0)), t2##_FUNC(sub.getString(1), t2##_DEFGRAB(1)), t3##_FUNC(sub.getString(2), t3##_DEFGRAB(2)), t4##_FUNC(sub.getString(3), t4##_DEFGRAB(3))) \
 
@@ -210 +210 @@
 //! execute-macro for functions with five parameters
 #define ExecutorExecute5(t1,t2,t3,t4,t5) \
-   else if (this->paramCount == 5 && this->defaultValue[0].getType() == t1##_PARAM && this->defaultValue[1].getType() == t2##_PARAM && this->defaultValue[2].getType() == t3##_PARAM && this->defaultValue[3].getType() == t4##_PARAM && this->defaultValue[4].getType() == t5##_PARAM) \
+   else if (this->paramCount == 5 && this->defaultValue[0] == t1##_PARAM && this->defaultValue[1] == t2##_PARAM && this->defaultValue[2] == t3##_PARAM && this->defaultValue[3] == t4##_PARAM && this->defaultValue[4] == t5##_PARAM) \
     EXECUTOREXECUTER(_5_##t1##_##t2##_##t3##_##t4##_##t5)(t1##_FUNC(sub.getString(0), t1##_DEFGRAB(0)), t2##_FUNC(sub.getString(1), t2##_DEFGRAB(1)), t3##_FUNC(sub.getString(2), t3##_DEFGRAB(2)), t4##_FUNC(sub.getString(3), t4##_DEFGRAB(3)), t5##_FUNC(sub.getString(4), t5##_DEFGRAB(4)))
 
@@ -269 +269 @@
     {
       SubString sub((const char*) parameters, " \n\t,", '\\');
+      printf("%s :: %s\n", this->getName(), (const char*) parameters);
 //! FUNCTOR_LIST is the List of Executive Functions
 #define FUNCTOR_LIST(x) ExecutorExecute ## x