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

Timestamp:

Jun 14, 2006, 5:50:18 PM (19 years ago)

Author:

bensch

Message:

trunk: merged the script_engine branche back here
merged with command
svn merge ​https://svn.orxonox.net/orxonox/branches/script_engine . -r8284:HEAD
no conflicts

Location:

trunk/src/lib/util

Files:

• executor/executor.h (modified) (1 diff)
• executor/executor_functional.cc (modified) (3 diffs)
• executor/executor_lua.cc (modified) (2 diffs)
• executor/executor_lua.h (modified) (3 diffs)
• loading/load_param.cc (modified) (1 diff)
• substring.h (modified) (1 diff)

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

@@ -33 +33 @@
  *  Objects of any Class (Templated)
  *  Default Values
- *  Functions with up to 5 parameters (more seems useless)
+ *  Functions with up to 5 parameters (more seems overhead, split up the function)
  *  Functions with many types (@see functor_list.h)
  */

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

@@ -15 +15 @@
 
 #include "executor.h"
-
-std::string ExecutorFunctional_returningString_from;
-std::string ExecutorFunctional_returningString_default;
+std::string ExecutorFunctional_returningString_from[5];
 
 
@@ -32 +30 @@
 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 ExecutorFunctional_returningString_from = isString(input, defaultValue); };
+template<> const std::string& fromString<const std::string&>(const std::string& input, const std::string& defaultValue) { return (input.size() > 0) ? input : defaultValue; };
 
 
@@ -48 +46 @@
 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<> const std::string& getDefault<const std::string&>(const MultiType* const defaultValues, unsigned int i) { return ExecutorFunctional_returningString_default = defaultValues[i].getString(); };
+template<> const std::string& getDefault<const std::string&>(const MultiType* const defaultValues, unsigned int i) { return ExecutorFunctional_returningString_from[i] = defaultValues[i].getString(); };
 
 

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

@@ -18 +18 @@
 #include "executor_lua.h"
 
-std::string temp;
+#include "lunar.h"
 
+std::string temp[5];
+
+template<typename type> type* fromLua(lua_State* state, int index) { type *obj = Lunar<type>::check(state, 1); lua_remove(state, 1); return obj;};
 template<> bool fromLua<bool>(lua_State* state, int index) { return lua_toboolean(state, index); };
 template<> int fromLua<int>(lua_State* state, int index) { return (int)lua_tonumber(state, index); };
@@ -25 +28 @@
 template<> float fromLua<float>(lua_State* state, int index) { return (float)lua_tonumber(state, index); };
 template<> char fromLua<char>(lua_State* state, int index) { return (char)lua_tonumber(state, index); };
-template<> const std::string& fromLua<const std::string&>(lua_State* state, int index) { temp = lua_tostring(state, index); return temp; };
+template<> const std::string& fromLua<const std::string&>(lua_State* state, int index) { temp[index] = lua_tostring(state, index); return temp[index]; };
 
 
-
+template<typename type> void toLua(lua_State* state, type value) { Lunar<type>::push(state, value, false); };
 template<> void toLua<bool>(lua_State* state, bool value) { lua_pushboolean(state, (int) value); };
 template<> void toLua<int>(lua_State* state, int value)  { lua_pushnumber(state, (lua_Number) value); };

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

@@ -14 +14 @@
 
 
-template<typename type> type fromLua(lua_State* state, int index) { PRINTF(1)("NOT IMPLEMENTED\n"); };
+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);
@@ -23 +23 @@
 
 
-template<typename type> void toLua(lua_State* state, type value) { PRINTF(1)("NOT IMPLEMENTED\n"); };
+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);
@@ -339 +339 @@
 };
 
-
-
-
-
-
-
 #endif /* _EXECUTOR_LUA_H */

trunk/src/lib/util/loading/load_param.cc

@@ -31 +31 @@
   :  object(object), paramName(paramName)
 {
-  this->object = object;
   this->inLoadCycle = inLoadCycle;
 

trunk/src/lib/util/substring.h

@@ -70 +70 @@
   inline unsigned int size() const { return this->strings.size(); };
   /** @param i the i'th String @returns the i'th string from the subset of Strings */
-const std::string& operator[](unsigned int i) const { return (i < this->strings.size()) ? this->strings[i] : emptyString;return this->getString(i); };
+  inline const std::string& operator[](unsigned int i) const { return (i < this->strings.size()) ? this->strings[i] : emptyString; };
   /** @param i the i'th String @returns the i'th string from the subset of Strings */
-  const std::string& getString(unsigned int i) const { return (*this)[i]; };
+  inline const std::string& getString(unsigned int i) const { return (*this)[i]; };
 
   // the almighty algorithm.