Changeset 9743 in orxonox.OLD

Timestamp:

Sep 16, 2006, 2:29:28 PM (18 years ago)

Author:

bensch

Message:

orxonox/new_class_id: lua_State executor definition

Location:

branches/new_class_id/src/lib/util

Files:

• Makefile.am (modified) (2 diffs)
• executor/executor_generic.h (modified) (6 diffs)
• executor/executor_lua_state.cc (copied) (copied from branches/new_class_id/src/lib/util/executor/executor_lua.cc) (1 diff)
• executor/executor_lua_state.h (copied) (copied from branches/new_class_id/src/lib/util/executor/executor_substring.h) (3 diffs)

branches/new_class_id/src/lib/util/Makefile.am

@@ -9 +9 @@
                 executor/executor.cc \
                 executor/executor_lua.cc \
+                executor/executor_lua_state.cc \
                 executor/executor_substring.cc
 
@@ -49 +50 @@
                 executor/executor_xml.h \
                 executor/executor_lua.h \
+                executor/executor_lua_state.h \
                 executor/executor_substring.h \
                 executor/executor_generic.h \

branches/new_class_id/src/lib/util/executor/executor_generic.h

@@ -55 +55 @@
 #endif /* __EXECUTOR_GENERIC_H_ */
 
+
 #ifdef __EXECUTOR_FUNCTIONAL_NAME
-
 ///////////
 //// 0 ////
@@ -101 +101 @@
 
 
-
-
 ///////////
 //// 1 ////
@@ -148 +146 @@
 
 
-
-
 ///////////
 //// 2 ////
@@ -196 +192 @@
 
 
-
-
 ///////////
 //// 3 ////
@@ -242 +236 @@
   };
 };
-
-
 
 
@@ -292 +284 @@
   };
 };
-
-
-
 
 

branches/new_class_id/src/lib/util/executor/executor_lua_state.cc

@@ -16 +16 @@
 //#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_
 
-#include "executor_lua.h"
+#include "executor_lua_state.h"
 
 #include "lunar.h"

branches/new_class_id/src/lib/util/executor/executor_lua_state.h

@@ -21 +21 @@
 
 
-#ifndef __EXECUTOR_SUBSTRING_H_
-#define __EXECUTOR_SUBSTRING_H_
+#ifndef __EXECUTOR_LUA_STATE_H_
+#define __EXECUTOR_LUA_STATE_H_
 
 
 #include "executor_generic.h"
-#include "substring.h"
+#include "luaincl.h"
 
+template<typename type> type fromLua(lua_State* state, int index);
+template<> bool fromLua<bool>(lua_State* state, int index);
+template<> int fromLua<int>(lua_State* state, int index);
+template<> unsigned int fromLua<unsigned int>(lua_State* state, int index);
+template<> float fromLua<float>(lua_State* state, int index);
+template<> char fromLua<char>(lua_State* state, int index);
+template<> const std::string& fromLua<const std::string&>(lua_State* state, int index);
 
-template<typename type> type fromString(const std::string& input, type defaultValue) { return defaultValue; };
-template<> bool fromString<bool>(const std::string& input, bool defaultValue);
-template<> int fromString<int>(const std::string& input, int defaultValue);
-template<> unsigned int fromString<unsigned int>(const std::string& input, unsigned int defaultValue);
-template<> float fromString<float>(const std::string& input, float defaultValue);
-template<> char fromString<char>(const std::string& input, char defaultValue);
-template<> const std::string& fromString<const std::string&>(const std::string& input, const std::string& defaultValue);
-
-template<typename type> type fromMulti(const MultiType& multi) { /* return defaultValue; */ };
-template<> bool fromMulti<bool>(const MultiType& multi);
-template<> int fromMulti<int>(const MultiType& multi);
-template<> unsigned int fromMulti<unsigned int>(const MultiType& multi);
-template<> float fromMulti<float>(const MultiType& multi);
-template<> char fromMulti<char>(const MultiType& multi);
-template<> const std::string& fromMulti<const std::string&>(const MultiType& multi);
-
-
-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);
-template<> int getDefault<int>(const MultiType* const defaultValues, unsigned int i);
-template<> unsigned int getDefault<unsigned int>(const MultiType* const defaultValues, unsigned int i);
-template<> float getDefault<float>(const MultiType* const defaultValues, unsigned int i);
-template<> char getDefault<char>(const MultiType* const defaultValues, unsigned int i);
-template<> const std::string& getDefault<const std::string&>(const MultiType* const defaultValues, unsigned int i);
-
+template<typename type> void toLua(lua_State* state, type value);
+template<> void toLua<bool>(lua_State* state, bool value);
+template<> void toLua<int>(lua_State* state, int value);
+template<> void toLua<unsigned int>(lua_State* state, unsigned int value);
+template<> void toLua<float>(lua_State* state, float value);
+template<> void toLua<char>(lua_State* state, char value);
+template<> void toLua<const std::string&>(lua_State* state, const std::string& value);
 
 /**
@@ -60 +49 @@
  * @param default The default Values.
  */
-template<> class ExecutorEvaluater <const SubString>
+template<> class ExecutorEvaluater <lua_State*>
 {
 public:
@@ -68 +57 @@
    */
   template <typename ToType, int index>
-  ToType operator()(const SubString& CallValue, const MultiType* const defaults)
+  ToType operator()(lua_State*& CallValue, const MultiType* const defaults)
   {
-    return (CallValue.size() > index) ?
-           fromString<ToType>(CallValue[index], getDefault<ToType>(defaults, index)) :
-           fromMulti<ToType>(defaults[index]);
+    return (fromLua<ToType>(CallValue, index));
   }
-  static const SubString& defaultValue() { return SubString::NullSubString; };
+  static lua_State*& defaultValue() { static lua_State* nullState; return nullState; };
 };
 
-#endif /* __EXECUTOR_SUBSTRING_H_ */
+#endif /* __EXECUTOR_LUA_STATE_H_ */