Changeset 8390 in orxonox.OLD

Timestamp:

Jun 14, 2006, 3:33:04 PM (18 years ago)

Author:

bensch

Message:

script: added scriptMethod, for better handling of Script-Functions/Methods…

Location:

branches/script_engine/src/lib/script_engine

Files:

• Makefile.am (modified) (3 diffs)
• script.cc (modified) (7 diffs)
• script_class.cc (modified) (1 diff)
• script_class.h (modified) (3 diffs)
• script_method.cc (copied) (copied from branches/script_engine/src/lib/script_engine/script_class.cc) (1 diff)
• script_method.h (copied) (copied from branches/script_engine/src/lib/script_engine/script_class.h) (1 diff)

branches/script_engine/src/lib/script_engine/Makefile.am

@@ -13 +13 @@
 
 libORXscript_a_SOURCES = \
-                script.cc\
-                script_manager.cc\
-                script_class.cc\
+                script.cc \
+                script_manager.cc \
+                script_class.cc \
+                script_method.cc \
+                \
                 account.cc \
                 object.cc
@@ -25 +27 @@
                 lunar.h\
                 script.h\
-                script_manager.h\
-                script_class.h
+                script_manager.h \
+                script_class.h \
+                script_method.h
 
 
@@ -32 +35 @@
 
 check_PROGRAMS = example
-
-
-
-
-
-
-
 example_DEPENDENCIES = \
                 $(MAINSRCDIR)/world_entities/libORXwe.a \
                 $(libORXlibs_a_LIBRARIES_) \
                 $(MAINSRCDIR)/util/libORXutils.a
-
 example_LDADD = \
                 $(MAINSRCDIR)/util/libORXutils.a \

branches/script_engine/src/lib/script_engine/script.cc

@@ -95 +95 @@
  {
    printf("Script %p: I am about to add %s of class %s\n",this,objectName.c_str(),className.c_str());
-   
+
    BaseObject* scriptClass = ClassList::getObject(className, CL_SCRIPT_CLASS);
    printf("The script class for %s is at %p \n",className.c_str(),scriptClass);
@@ -171 +171 @@
      reportError(error);
      //clean up
-     currentFunction.assign(""); 
+     currentFunction.assign("");
      argumentCount = returnCount = 0;
      return false;
@@ -184 +184 @@
    else
      printf("Error: no function selected.\n");
-   
+
    return false;
  }
@@ -241 +241 @@
  int Script::getReturnedInt()
  {
-   int returnValue;
+   int returnValue = 0;
    if(returnCount > 0)
    {
@@ -257 +257 @@
  bool Script::getReturnedBool()
  {
-   bool returnValue;
+   bool returnValue = false;
    if(returnCount > 0)
    {
@@ -272 +272 @@
 float Script::getReturnedFloat()
  {
-   float returnValue;
+   float returnValue = 0.0f;
    if(returnCount > 0)
    {
@@ -287 +287 @@
  void Script::getReturnedString(std::string& string)
  {
-   const char* returnValue;
+   const char* returnValue = "";
    if(returnCount > 0)
    {

branches/script_engine/src/lib/script_engine/script_class.cc

@@ -17 +17 @@
 
 #include "script_class.h"
-
-using namespace std;
-
 
 /**

branches/script_engine/src/lib/script_engine/script_class.h

@@ -11 +11 @@
 #include "script.h"
 #include "lunar.h"
-
-// FORWARD DECLARATION
-
 
 /**
@@ -28 +25 @@
 {
 
-  public:
-    virtual ~ScriptClass();
+public:
+  virtual ~ScriptClass();
 
-    bool operator==(const std::string& name) { return (this->getName() == name); }
-    bool operator==(ClassID classID) { return (this->classID == classID); }
+  bool operator==(const std::string& name) { return (this->getName() == name); }
+  bool operator==(ClassID classID) { return (this->classID == classID); }
 
-    virtual void registerClass(Script* script) = 0;
-    virtual int insertObject(Script* L, BaseObject* obj, bool gc=false) = 0;
+  virtual void registerClass(Script* script) = 0;
+  virtual int insertObject(Script* L, BaseObject* obj, bool gc=false) = 0;
 
-  protected:
-    ScriptClass(const std::string& name, ClassID classID);
+protected:
+  ScriptClass(const std::string& name, ClassID classID);
 
-  private:
-    ClassID             classID;
+private:
+  ClassID             classID;
 };
 
@@ -50 +47 @@
 class tScriptable : public ScriptClass
 {
-  public:
-    tScriptable(const std::string& name, ClassID classID)
-        : ScriptClass(name, classID)
-    { }
+public:
+  tScriptable(const std::string& name, ClassID classID)
+      : ScriptClass(name, classID)
+  { }
 
-    virtual void registerClass(Script* script)
-    {
-      Lunar<T>::Register(script);
-    }
-    virtual int insertObject(Script* L, BaseObject* obj, bool gc=false)
-    {
-      return Lunar<T>::insertObject(L, dynamic_cast<T*>(obj), obj->getName(), gc);
-    }
-
-
-
-}
-;
+  virtual void registerClass(Script* script)
+  {
+    Lunar<T>::Register(script);
+  }
+  virtual int insertObject(Script* L, BaseObject* obj, bool gc=false)
+  {
+    return Lunar<T>::insertObject(L, dynamic_cast<T*>(obj), obj->getName(), gc);
+  }
+};
 
 

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

@@ -16 +16 @@
 //#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_
 
-#include "script_class.h"
-
-using namespace std;
-
+#include "script_method.h"
 
 /**
- * standard constructor
+ * @param standard constructor
  * @todo this constructor is not jet implemented - do it
 */
-ScriptClass::ScriptClass(const std::string& name, ClassID classID)
- : BaseObject(name)
+ScriptMethod::ScriptMethod(const std::string& methodName, const Executor& executor)
 {
-   this->setClassID(CL_SCRIPT_CLASS, "ScriptClass");
-   this->classID = classID;
+  this->addMethod(methodName, executor);
 }
 
+ScriptMethod& ScriptMethod::addMethod(const std::string& methodName, const Executor& executor)
+{
+  this->methods.push_back(ScriptMethod::Method(methodName, executor));
+
+  return *this;
+}
+
+ScriptMethod::Method::Method(const std::string& name, const Executor& executor)
+{
+  this->name = name;
+  this->executor = executor.clone();
+}
 
 /**
  * standard deconstructor
 */
-ScriptClass::~ScriptClass ()
+ScriptMethod::~ScriptMethod()
 {
-  // delete what has to be deleted here
+  for (unsigned int i = 0; i < methods.size(); i ++)
+  {
+    delete methods[i].executor;
+  };
 }
+
+
+

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

@@ -4 +4 @@
 */
 
-#ifndef _SCRIPT_CLASS_H
-#define _SCRIPT_CLASS_H
+#ifndef _SCRIPT_METHOD_H
+#define _SCRIPT_METHOD_H
 
-#include "base_object.h"
+#include <vector>
 
-#include "script.h"
 #include "lunar.h"
-
-// FORWARD DECLARATION
+#include "executor/executor_lua.h"
 
 
-/**
- * Creates a factory to a Loadable Class.
- * this should be used at the beginning of all the Classes that should be loadable (in the cc-file)
- */
-#define CREATE_SCRIPTABLE_CLASS(CLASS_NAME, CLASS_ID) \
-    tScriptable<CLASS_NAME> global_##CLASS_NAME##_ScriptableClass(#CLASS_NAME, CLASS_ID)
+class ScriptMethod
+{
+public:
+  ScriptMethod(const std::string& methodName, const Executor& executor);
+  ~ScriptMethod();
+
+  ScriptMethod& addMethod(const std::string& methodName, const Executor& executor);
 
 
+private:
+  struct Method
+  {
+    Method(const std::string& name, const Executor& executor);
+    std::string    name;
+    Executor*      executor;
+  };
 
-//! A class for ...
-class ScriptClass : protected BaseObject
-{
-
-  public:
-    virtual ~ScriptClass();
-
-    bool operator==(const std::string& name) { return (this->getName() == name); }
-    bool operator==(ClassID classID) { return (this->classID == classID); }
-
-    virtual void registerClass(Script* script) = 0;
-    virtual int insertObject(Script* L, BaseObject* obj, bool gc=false) = 0;
-
-  protected:
-    ScriptClass(const std::string& name, ClassID classID);
-
-  private:
-    ClassID             classID;
+  std::vector<Method> methods;
 };
 
-
-
-
-template <class T>
-class tScriptable : public ScriptClass
-{
-  public:
-    tScriptable(const std::string& name, ClassID classID)
-        : ScriptClass(name, classID)
-    { }
-
-    virtual void registerClass(Script* script)
-    {
-      Lunar<T>::Register(script);
-    }
-    virtual int insertObject(Script* L, BaseObject* obj, bool gc=false)
-    {
-      return Lunar<T>::insertObject(L, dynamic_cast<T*>(obj), obj->getName(), gc);
-    }
-
-
-
-}
-;
-
-
-#endif /* _SCRIPT_CLASS_H */
+#endif /* _SCRIPT_METHOD_H */