Changeset 8408 in orxonox.OLD for trunk/src/lib/script_engine/script.cc

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

File:

• trunk/src/lib/script_engine/script.cc (modified) (12 diffs)

trunk/src/lib/script_engine/script.cc

@@ -23 +23 @@
   luaopen_math(luaState);
   luaopen_debug(luaState);
-
   if (root != NULL)
     this->loadParams(root);
@@ -38 +37 @@
 void Script::loadParams(const TiXmlElement* root)
 {
+  //printf("Loading params for %p \n",this);
   BaseObject::loadParams(root);
 
@@ -77 +77 @@
      else
      {
-      reportError(error);
-     }
-
-   }
-   else
-   {
+       printf("ERROR while loading file %s: \n",filename.c_str());
+       reportError(error);
+     }
+
+   }
+   else
+   {
+     printf("ERROR while loading file %s: \n",filename.c_str());
      reportError(error);
    }
@@ -92 +94 @@
  void Script::addObject(const std::string& className, const std::string& objectName)
  {
+   //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);
    WorldObject tmpObj;
    if (scriptClass != NULL)
@@ -103 +108 @@
 
      BaseObject* object = ClassList::getObject(objectName, className);
+     //printf("%s is at %p \n",objectName.c_str(),object);
      if (object != NULL && !objectIsAdded(objectName))
      {
@@ -162 +168 @@
     if(error != 0)
     {
+     printf("ERROR while executing function %s: \n",currentFunction.c_str());
      reportError(error);
+     //clean up
+     currentFunction.assign("");
+     argumentCount = returnCount = 0;
      return false;
     }
@@ -174 +184 @@
    else
      printf("Error: no function selected.\n");
+
+   return false;
  }
 
@@ -229 +241 @@
  int Script::getReturnedInt()
  {
-   int returnValue;
+   int returnValue = 0;
    if(returnCount > 0)
    {
-     if(lua_isnumber(luaState, -1))
-     {
-       returnValue = (int)lua_tonumber(luaState, -1);
+     if(lua_isnumber(luaState, -1*returnCount))
+     {
+       returnValue = (int)lua_tonumber(luaState, -1*returnCount);
+       lua_remove(luaState,-1*returnCount);
        returnCount--;
-       lua_pop(luaState,1);
+       
      }
    }
@@ -245 +258 @@
  bool Script::getReturnedBool()
  {
-   bool returnValue;
+   bool returnValue = false;
    if(returnCount > 0)
    {
-     if(lua_isboolean(luaState, -1))
-     {
-       returnValue = (bool)lua_toboolean(luaState, -1);
+     if(lua_isboolean(luaState, -1*returnCount))
+     {
+       returnValue = (bool)lua_toboolean(luaState, -1*returnCount);
+       lua_remove(luaState,-1*returnCount);
        returnCount--;
-       lua_pop(luaState,1);
      }
    }
@@ -260 +273 @@
 float Script::getReturnedFloat()
  {
-   float returnValue;
+   float returnValue = 0.0f;
    if(returnCount > 0)
    {
-     if(lua_isnumber(luaState, -1))
-     {
-       returnValue = (float)lua_tonumber(luaState, -1);
+     if(lua_isnumber(luaState, -1*returnCount))
+     {
+       returnValue = (float)lua_tonumber(luaState, -1*returnCount);
+       lua_remove(luaState,-1*returnCount);
        returnCount--;
-       lua_pop(luaState,1);
      }
    }
@@ -275 +288 @@
  void Script::getReturnedString(std::string& string)
  {
-   const char* returnValue;
+   const char* returnValue = "";
    if(returnCount > 0)
    {
-     if(lua_isstring(luaState, -1))
-     {
-       returnValue = lua_tostring(luaState, -1);
+     if(lua_isstring(luaState, -1*returnCount))
+     {
+       returnValue = lua_tostring(luaState, -1*returnCount);
+       lua_remove(luaState,-1*returnCount);
        returnCount--;
-       lua_pop(luaState,1);
      }
    }
@@ -296 +309 @@
   fprintf(stderr, "ERROR: %s\n", msg);
   lua_pop(luaState, 1);
+ }
   return error;
  }
- }