Changeset 5652 in orxonox.OLD for trunk/src/lib/util

Timestamp:

Nov 20, 2005, 6:32:39 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: new LoadParam procedure with all NON-cycling load-options, and it works perfectly (on first sight

now going to make the same for cycling LoadOptions

Location:

trunk/src/lib/util/executor

Files:

• executor.h (modified) (5 diffs)
• executor_specials.h (modified) (2 diffs)

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

@@ -21 +21 @@
 //! an enumerator for the definition of the Type.
 typedef enum {
-  Executor_Objective   = 1,
-  Executor_Static      = 2,
+  Executor_Objective         = 0x00000001,
+  Executor_Static            = 0x00000002,
+
+  Executor_NoLoadString      = 0x00000010,
 } Executor_Type;
 
@@ -43 +45 @@
 
     /** @returns the Type of this Function (either static or objective) */
-    inline Executor_Type getType() const { return this->functorType; };
+    inline long getType() const { return this->functorType; };
     /** @returns the Count of Parameters this Executor takes */
     inline unsigned int getParamCount() const { return this->paramCount; };
@@ -56 +58 @@
 
   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.
+    long                        functorType;      //!< The type of Function we've got (either static or objective).
+    unsigned int                paramCount;       //!< the count of parameters.
+    MultiType*                  defaultValue;     //!< Default Values.
 };
 
@@ -196 +198 @@
 #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) \
-    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)))
+    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))) \
+
 
 //! execute-macro for functions with five parameters
@@ -258 +261 @@
     virtual void execute (BaseObject* object, const char* parameters)
     {
-      SubString sub(parameters, true);
+      SubString sub(parameters, ',');  /// FIXME ///
 //! FUNCTOR_LIST is the List of Executive Functions
 #define FUNCTOR_LIST(x) ExecutorExecute ## x

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

@@ -38 +38 @@
 
       this->functionPointer = function;
+      this->functorType = Executor_Objective | Executor_NoLoadString;
     }
 
@@ -66 +67 @@
   private:
     /**
-     * used for the copy-constructor
+     * used for the copy-(Clone)-constructor
      */
     ExecutorXML() : Executor() { };