Changeset 7716 in orxonox.OLD for trunk/src/orxonox.cc

Timestamp:

May 19, 2006, 2:43:22 AM (19 years ago)

Author:

bensch

Message:

trunk: static and const calls all work

File:

• trunk/src/orxonox.cc (modified) (3 diffs)

trunk/src/orxonox.cc

@@ -417 +417 @@
 
 
-template<typename type> MT_Type ExecutorParamType() { return MT_EXT1; };
-template<> MT_Type ExecutorParamType<bool>() { return MT_EXT1; };
-template<> MT_Type ExecutorParamType<int>() { return MT_INT; };
-template<> MT_Type ExecutorParamType<unsigned int>() { return MT_UINT; };
-template<> MT_Type ExecutorParamType<float>() { return MT_FLOAT; };
-template<> MT_Type ExecutorParamType<char>() { return MT_CHAR; };
-template<> MT_Type ExecutorParamType<const std::string&>() { return MT_STRING; };
-
-template<typename type> type fromString(const std::string& input, type defaultValue) {return defaultValue; };
-template<> bool fromString<bool>(const std::string& input, bool defaultValue) { return isBool(input, defaultValue); };
-template<> int fromString<int>(const std::string& input, int defaultValue) { return isInt(input, defaultValue); };
-template<> unsigned int fromString<unsigned int>(const std::string& input, unsigned int defaultValue) { return isInt(input, defaultValue); };
-template<> float fromString<float>(const std::string& input, float defaultValue) { return isFloat(input, defaultValue); };
-template<> char fromString<char>(const std::string& input, char defaultValue) { return isInt(input, defaultValue); };
-template<> const std::string& fromString<const std::string&>(const std::string& input, const std::string& defaultValue) { return isString(input, defaultValue); };
-
-template<typename type> type getDefault(const MultiType* const defaultValues, unsigned int i) { return (type)0; };
-template<> bool getDefault<bool>(const MultiType* const defaultValues, unsigned int i) { return defaultValues[i].getBool(); };
-template<> int getDefault<int>(const MultiType* const defaultValues, unsigned int i) { return defaultValues[i].getInt(); };
-template<> unsigned int getDefault<unsigned int>(const MultiType* const defaultValues, unsigned int i) { return defaultValues[i].getInt(); };
-template<> float getDefault<float>(const MultiType* const defaultValues, unsigned int i) { return defaultValues[i].getFloat(); };
-template<> char getDefault<char>(const MultiType* const defaultValues, unsigned int i) { return defaultValues[i].getChar(); };
-template<> std::string getDefault<std::string>(const MultiType* const defaultValues, unsigned int i) { return defaultValues[i].getString(); };
-
-
-template<class T> class Executor0Params : public Executor
-{
-private:
-  void (T::*functionPointer)();
-
-public:
-  Executor0Params (void (T::*functionPointer)())
-      : Executor()
-  {
-    this->functorType = Executor_Objective;
-    this->functionPointer = functionPointer;
-  }
-  virtual void operator()(BaseObject* object, const SubString& sub = SubString()) const
-  {
-    (dynamic_cast<T*>(object)->*functionPointer)();
-  };
-
-  Executor* clone() const {};
-};
-
-
-template<class T, typename type0> class Executor1Params : public Executor
-{
-private:
-  void (T::*functionPointer)(type0);
-
-public:
-  Executor1Params (void (T::*functionPointer)(type0))
-      : Executor(ExecutorParamType<type0>())
-  {
-    this->functorType = Executor_Objective;
-    this->functionPointer = functionPointer;
-  }
-  virtual void operator()(BaseObject* object, const SubString& sub = SubString()) const
-  {
-
-    /* // THE VERY COOL DEBUG
-    printf("SUB[0] : %s\n", sub[0].c_str());
-    printf("getDefault<type0>(this->defaultValue, 0):::: %d\n", getDefault<type0>(this->defaultValue, 0));
-    printf("VALUE: %d\n", fromString<type0>(sub[0], getDefault<type0>(this->defaultValue, 0)));
-    */
-    (dynamic_cast<T*>(object)->*functionPointer)( fromString<type0>(sub[0], getDefault<type0>(this->defaultValue, 0)) );
-  };
-
-  virtual Executor* clone() const {};
-};
-
-/// DOUBLE PENETRATION
-template<class T, typename type0, typename type1> class Executor2Params : public Executor
-{
-private:
-  void (T::*functionPointer)(type0, type1);
-
-public:
-  Executor2Params (void (T::*functionPointer)(type0, type1))
-      : Executor(ExecutorParamType<type0>(), ExecutorParamType<type1>())
-  {
-    this->functorType = Executor_Objective;
-    this->functionPointer = functionPointer;
-  }
-  virtual void operator()(BaseObject* object, const SubString& sub = SubString()) const
-  {
-    (dynamic_cast<T*>(object)->*functionPointer)(
-      fromString<type0>(sub[0], getDefault<type0>(this->defaultValue, 0)),
-      fromString<type1>(sub[1], getDefault<type1>(this->defaultValue, 1)));
-  };
-
-  virtual Executor* clone() const {};
-};
-
-
-template<class T> Executor* createExecutor(void (T::*functionPointer)())
-{
-  return new Executor0Params<T>(functionPointer);
-}
-template<class T> Executor* createExecutor(void (T::*functionPointer)(bool))
-{
-  return new Executor1Params<T, bool>(functionPointer);
-}
-template<class T> Executor* createExecutor(void (T::*functionPointer)(int))
-{
-  return new Executor1Params<T, int>(functionPointer);
-}
-template<class T> Executor* createExecutor(void (T::*functionPointer)(bool, int))
-{
-  return new Executor2Params<T, bool, int>(functionPointer);
-}
-
+#include "executor/executor_functional.h"
+
+#define EXECUTOR_FUNCTIONAL_USE_STATIC
+#include "executor/executor_functional.h"
 
 class TestClass : public BaseObject
@@ -540 +431 @@
   void printTestBool(bool b) { printf("%d\n", (int)b); };
   void printTwoVals(bool b, int i) { printf ("%d %d\n", b, i); };
+
+  static void printStatic() { printf("STATIC\n");};
 };
+
+template<class T> Executor* createExecutorStatic(void (*functionPointer)())
+ {
+   return new Executor0Params_static<TestClass>(functionPointer);
+ }
 
 void TEST()
@@ -546 +444 @@
   TestClass test;
   SubString testStrings("1, 2, 3", ",", SubString::WhiteSpaces, false);
-  (*createExecutor(&TestClass::printTest))(&test, testStrings);
-  (*createExecutor(&TestClass::printTestInt))(&test, testStrings);
-  (*createExecutor(&TestClass::printTestBool))(&test, testStrings);
-  (*createExecutor(&TestClass::printTwoVals))(&test, testStrings);
+  (*createExecutor<TestClass>(&TestClass::printTest))(&test, testStrings);
+  (*createExecutor<TestClass>(&TestClass::printTestInt))(&test, testStrings);
+  (*createExecutor<TestClass>(&TestClass::printTestBool))(&test, testStrings);
+  (*createExecutor<TestClass>(&TestClass::printTwoVals))(&test, testStrings);
+  (*createExecutor<TestClass>(&TestClass::printStatic))(&test, testStrings);
 
 }