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

Timestamp:

Nov 18, 2005, 6:20:23 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: more about the executor.

Location:

trunk/src/lib/util/executor

Files:

• executor.cc (modified) (4 diffs)
• executor.h (modified) (3 diffs)

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

@@ -68 +68 @@
 
 /**
- * lets a command be described
- * @param description the description of the Given command
- */
-Executor* Executor::describe(const char* description)
-{
-  if (this == NULL)
-    return NULL;
- else
- {
-   this->description = description;
-   return this;
- }
-}
-
-/**
  * sets default Values of the Commands
  * @param count how many default Values to set.
@@ -93 +78 @@
 Executor* Executor::defaultValues(unsigned int count, ...)
 {
+  va_list values;
+  va_start(values, count);
+
+  this->defaultValues(count, values);
+}
+
+Executor* Executor::defaultValues(unsigned int count, va_list values)
+{
   if (this == NULL)
     return NULL;
@@ -100 +93 @@
     count = this->paramCount;
 
-  va_list defaultList;
-  va_start(defaultList, count);
 
   for (unsigned int i = 0; i < count; i++)
@@ -108 +99 @@
     {
       case MT_BOOL:
-        this->defaultValue[i].setInt(va_arg(defaultList, int));
+        this->defaultValue[i].setInt(va_arg(values, int));
         break;
       case MT_CHAR:
-        this->defaultValue[i].setChar((char)va_arg(defaultList, int));
+        this->defaultValue[i].setChar((char)va_arg(values, int));
         break;
       case MT_STRING:
-        this->defaultValue[i].setString(va_arg(defaultList, char*));
+        this->defaultValue[i].setString(va_arg(values, char*));
         break;
       case MT_INT:
-        this->defaultValue[i].setInt(va_arg(defaultList, int));
+        this->defaultValue[i].setInt(va_arg(values, int));
         break;
 /*      case MT_UINT:
-        this->defaultValue[i].setInt((int)va_arg(defaultList, unsigned int));
+        this->defaultValue[i].setInt((int)va_arg(values, unsigned int));
         break;*/
       case MT_FLOAT:
-        this->defaultValue[i].setFloat(va_arg(defaultList, double));
+        this->defaultValue[i].setFloat(va_arg(values, double));
         break;
 /*      case MT_LONG:
-        this->defaultValue[i].setInt((int) va_arg(defaultList, long));
+        this->defaultValue[i].setInt((int) va_arg(values, long));
         break;*/
       default:

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

@@ -12 +12 @@
 #include "multi_type.h"
 #include "substring.h"
-#include "functor_list.h"
+#include "functor_list.h" //< MUST BE INCLUDED HERE AT LEAST ONCE.
 
 #include <stdarg.h>
@@ -32 +32 @@
 {
   public:
-    static bool execute (const char* executionString);
-
-    Executor* describe(const char* description);
     Executor* defaultValues(unsigned int count, ...);
+    Executor* defaultValues(unsigned int count, va_list values);
 
     /** executes a Command @param object the object to apply this to @param parameters the parameters the command takes */
     virtual void execute (BaseObject* object, const char* parameters) = 0;
-
 
     static void debug();
@@ -56 +53 @@
 
   private:
-    const char*                      description;                          //!< A description for this commnand. (initially NULL). Assigned with (create)->describe("blablabla");
 };