Changeset 5328 in orxonox.OLD for trunk/src

Timestamp:

Oct 8, 2005, 10:13:32 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: almost working

Location:

trunk/src/lib/shell

Files:

• shell_command.cc (modified) (1 diff)
• shell_command.h (modified) (13 diffs)

trunk/src/lib/shell/shell_command.cc

@@ -211 +211 @@
   {
     ShellCommandClass::commandClassList = new tList<ShellCommandClass>;
-//    ShellCommandStatic<ShellCommandBase>::registerCommand("debug", "ShellCommand", &ShellCommandBase::debug);
+    ShellCommandStatic<ShellCommandBase>::registerCommand("debug", "ShellCommand", ShellCommandBase::debug);
   }
 }

trunk/src/lib/shell/shell_command.h

@@ -41 +41 @@
 
 
+//! an enumerator for the definition of the Type.
+typedef enum {
+  ShellCommand_Objective = 1,
+  ShellCommand_Static    = 2,
+} ShellCommand_Type;
+
 ////////////////
 // BASE CLASS //
@@ -99 +105 @@
     ~ShellCommandBase();
 
+    /** @returns the Type of this Function (either static or objective) */
+    inline ShellCommand_Type getType() { return this->functorType; };
+
     static bool isRegistered(const char* commandName, const char* className, unsigned int paramCount, ...);
     static const char* paramToString(long parameter);
@@ -109 +118 @@
 
   protected:
+    ShellCommand_Type                functorType;                          //!< The type of Function we've got (either static or objective).
     void*                            functionPointer;                      //!< The pointeer to the function of the Class (or static pointer if ClassID == CL_NULL )
     unsigned int                     paramCount;                           //!< the count of parameters.
@@ -116 +126 @@
     float                            defaultFloats[FUNCTOR_MAX_ARGUMENTS]; //!< A list of default Floats stored.
     bool                             defaultBools[FUNCTOR_MAX_ARGUMENTS];  //!< A list of default Bools stored.
+
 
   private:
@@ -149 +160 @@
 // SHELLCOMMANDEXECUTER can be redefined too.
 // SHELLCOMMANDINCLASS
+// SHELLCOMMANDTYPE
 //! registers a command without any parameters
 #define ShellCommandRegister0() \
@@ -212 +224 @@
   : ShellCommandBase(commandName, className, 0) \
   { \
+    this->functorType = SHELLCOMMANDTYPE; \
     this->functionPointer_0 = function; \
   }
@@ -221 +234 @@
   : ShellCommandBase(commandName, className, 1, t1##_PARAM, d1) \
   { \
+    this->functorType = SHELLCOMMANDTYPE; \
     this->functionPointer_1_##t1 = function; \
   }
@@ -230 +244 @@
   : ShellCommandBase(commandName, className, 2, t1##_PARAM, d1, t2##_PARAM, d2) \
   { \
+    this->functorType = SHELLCOMMANDTYPE; \
     this->functionPointer_2_##t1##_##t2 = function; \
   }
@@ -239 +254 @@
   : ShellCommandBase(commandName, className, 3, t1##_PARAM, d1, t2##_PARAM, d2, t3##_PARAM, d3) \
   { \
+    this->functorType = SHELLCOMMANDTYPE; \
     this->functionPointer_3_##t1##_##t2##_##t3 = function; \
   }
@@ -248 +264 @@
   : ShellCommandBase(commandName, className, 4, t1##_PARAM, d1, t2##_PARAM, d2, t3##_PARAM, d3, t4##_PARAM, d4) \
   { \
+    this->functorType = SHELLCOMMANDTYPE; \
     this->functionPointer_4_##t1##_##t2##_##t3##_##t4 = function; \
   }
@@ -257 +274 @@
   : ShellCommandBase(commandName, className, 5, t1##_PARAM, d1, t2##_PARAM, d2, t3##_PARAM, d3, t4##_PARAM, d4, t5##_PARAM, d5) \
   { \
+    this->functorType = SHELLCOMMANDTYPE; \
     this->functionPointer_5_##t1##_##t2##_##t3##_##t4##_##t5 = function; \
   }
@@ -313 +331 @@
 #endif
 #define SHELLCOMMANDINCLASS(FUNCTION)      (T::FUNCTION)
-
+#ifdef SHELLCOMMANDTYPE
+#undef SHELLCOMMANDTYPE
+#endif
+#define SHELLCOMMANDTYPE                   ShellCommand_Objective
 //! FUNCTOR_LIST is the List of command-registerers
 #define FUNCTOR_LIST(x) ShellCommandRegister ## x
@@ -350 +371 @@
 #undef SHELLCOMMANDEXECUTER
 #endif
-#define SHELLCOMMANDEXECUTER(nameExt)     T::functionPointer##nameExt
+#define SHELLCOMMANDEXECUTER(nameExt)     functionPointer##nameExt
 #ifdef SHELLCOMMANDINCLASS
 #undef SHELLCOMMANDINCLASS
 #endif
 #define SHELLCOMMANDINCLASS(FUNCTION)     (FUNCTION)
+#ifdef SHELLCOMMANDTYPE
+#undef SHELLCOMMANDTYPE
+#endif
+#define SHELLCOMMANDTYPE                   ShellCommand_Static
 
 //! FUNCTOR_LIST is the List of command-registerers