Changeset 9727 in orxonox.OLD for branches/new_class_id/src/lib/script_engine

Timestamp:

Sep 14, 2006, 5:24:31 PM (18 years ago)

Author:

bensch

Message:

orxonox/new_class_id: new Executor construct, that is much more typesafe, faster, and easier to extend…

Also changed the LoadParam process, and adapted ScriptEngine calls

Then at the end, some missing headers appeared, and appended them to all the cc-files again.

Location:

branches/new_class_id/src/lib/script_engine

Files:

• lunar.h (modified) (2 diffs)
• script_manager.cc (modified) (1 diff)
• script_method.cc (modified) (2 diffs)
• script_method.h (modified) (2 diffs)

branches/new_class_id/src/lib/script_engine/lunar.h

@@ -16 +16 @@
   userdataType;
 public:
-  typedef Executor* mfp;
+  typedef Executor<lua_State*>* mfp;
   typedef struct { const char *name; mfp mfunc; }
   RegType;
@@ -184 +184 @@
     lua_remove(L, 1);  // remove self so member function args start at index 1
     // get member function from upvalue
-    Executor *l = static_cast<Executor*>(lua_touserdata(L, lua_upvalueindex(1)));
-    int value;
-    (*l)(obj, value, L);  // call member function
-    return value;
+    mfp l = static_cast<mfp>(lua_touserdata(L, lua_upvalueindex(1)));
+    (*l)(obj, L);  // call member function
+    return l->hasRetVal()? 1 : 0;
   }
 

branches/new_class_id/src/lib/script_engine/script_manager.cc

@@ -27 +27 @@
 #include "script_trigger.h"
 #include "luaincl.h"
-#include "loading/load_param.h"
-#include "parser/tinyxml/tinyxml.h"
+#include "loading/load_param_xml.h"
 
 

branches/new_class_id/src/lib/script_engine/script_method.cc

@@ -25 +25 @@
 { }
 
-ScriptMethod* ScriptMethod::addMethod(const std::string& methodName, const Executor& executor)
+ScriptMethod* ScriptMethod::addMethod(const std::string& methodName, const Executor<lua_State*>& executor)
 {
   this->methods.push_back(ScriptMethod::Method(methodName, executor));
@@ -32 +32 @@
 }
 
-ScriptMethod::Method::Method(const std::string& name, const Executor& executor)
+ScriptMethod::Method::Method(const std::string& name, const Executor<lua_State*>& executor)
 {
   this->name = name;

branches/new_class_id/src/lib/script_engine/script_method.h

@@ -18 +18 @@
   ~ScriptMethod();
 
-  ScriptMethod* addMethod(const std::string& methodName, const Executor& executor);
+  ScriptMethod* addMethod(const std::string& methodName, const Executor<lua_State*>& executor);
 
   unsigned int size() const { return methods.size(); };
 
   const std::string& name(unsigned int methodNumber) const { return methods[methodNumber].name; };
-  const Executor* executor(unsigned int methodNumber) const { return methods[methodNumber].executor; };
+  const Executor<lua_State*>* executor(unsigned int methodNumber) const { return methods[methodNumber].executor; };
 
 
@@ -29 +29 @@
   struct Method
   {
-    Method(const std::string& name, const Executor& executor);
-    std::string    name;
-    Executor*      executor;
+    Method(const std::string& name, const Executor<lua_State*>& executor);
+    std::string             name;
+    Executor<lua_State*>*   executor;
   };