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

Timestamp:

Mar 8, 2006, 2:02:58 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: Executor now uses MultiType instead of va_arg

File:

• trunk/src/lib/util/executor/executor.h (modified) (9 diffs)

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

@@ -1 +1 @@
 /*!
  * @file executor.h
- * Definition of a on-screen-shell
+ * Definition of an Executor
  */
 
@@ -16 +16 @@
 #include <stdarg.h>
 
-// FORWARD DECLARATION
-template<class T> class tList;
-
 //! an enumerator for the definition of the Type.
 typedef enum {
@@ -30 +27 @@
 // BASE CLASS //
 ////////////////
-//! a baseClass for all possible Executors
+//! a BaseClass for all possible Executors
+/**
+ * An Executor is an Object, that is able to call Objects of Any type (class)
+ * and execute a function with given parameters on it.
+ *
+ * The Executor is able to handle:
+ *  Objects of any Class (Templated)
+ *  Default Values
+ *  Functions with up to 5 parameters (more seems useless)
+ *  Functions with many types (see functor_list.h)
+ */
 class Executor: public BaseObject
 {
@@ -52 +59 @@
 
   protected:
-    Executor();
-    Executor(unsigned int paramCount, ...);
+    Executor(const MultiType& param0 = MT_NULL,
+             const MultiType& param1 = MT_NULL,
+             const MultiType& param2 = MT_NULL,
+             const MultiType& param3 = MT_NULL,
+             const MultiType& param4 = MT_NULL);
 
     void cloning(Executor* executor) const;
-
-//    const SubString& getSubString(const char* string) const { return SubString(string); };
 
   protected:
     long                        functorType;      //!< The type of Function we've got (either static or objective).
     unsigned int                paramCount;       //!< the count of parameters.
-    MultiType*                  defaultValue;     //!< Default Values.
+    MultiType                   defaultValue[5];  //!< Default Values.
 };
 
@@ -132 +140 @@
 #define ExecutorConstructor1(t1) \
   EXECUTOR(void EXECUTORINCLASS(*function)(t1##_TYPE)) \
-  : Executor(1, t1##_PARAM) \
+  : Executor(t1##_PARAM) \
   { \
     this->functorType = EXECUTORTYPE; \
@@ -141 +149 @@
 #define ExecutorConstructor2(t1,t2) \
   EXECUTOR(void EXECUTORINCLASS(*function)(t1##_TYPE, t2##_TYPE)) \
-  : Executor(2, t1##_PARAM, t2##_PARAM) \
+  : Executor(t1##_PARAM, t2##_PARAM) \
   { \
     this->functorType = EXECUTORTYPE; \
@@ -150 +158 @@
 #define ExecutorConstructor3(t1,t2,t3) \
   EXECUTOR(void EXECUTORINCLASS(*function)(t1##_TYPE, t2##_TYPE, t3##_TYPE)) \
-  : Executor(3, t1##_PARAM, t2##_PARAM, t3##_PARAM) \
+  : Executor(t1##_PARAM, t2##_PARAM, t3##_PARAM) \
   { \
     this->functorType = EXECUTORTYPE; \
@@ -159 +167 @@
 #define ExecutorConstructor4(t1,t2,t3,t4) \
   EXECUTOR(void EXECUTORINCLASS(*function)(t1##_TYPE, t2##_TYPE, t3##_TYPE, t4##_TYPE)) \
-  : Executor(4, t1##_PARAM, t2##_PARAM, t3##_PARAM, t4##_PARAM) \
+  : Executor(t1##_PARAM, t2##_PARAM, t3##_PARAM, t4##_PARAM) \
   { \
     this->functorType = EXECUTORTYPE; \
@@ -168 +176 @@
 #define ExecutorConstructor5(t1,t2,t3,t4,t5) \
   EXECUTOR(void EXECUTORINCLASS(*function)(t1##_TYPE, t2##_TYPE, t3##_TYPE, t4##_TYPE, t5##_TYPE)) \
-  : Executor(5, t1##_PARAM, t2##_PARAM, t3##_PARAM, t4##_PARAM, t5##_PARAM) \
+  : Executor(t1##_PARAM, t2##_PARAM, t3##_PARAM, t4##_PARAM, t5##_PARAM) \
   { \
     this->functorType = EXECUTORTYPE; \