Changeset 6629

Timestamp:

Mar 28, 2010, 10:46:07 PM (14 years ago)

Author:

rgrieder

Message:

Fixed LuaState::doFile return value issue.

Location:

code/branches/gamestate

Files:

• data/lua/LuaStateInit.lua (modified) (2 diffs)
• src/libraries/core/LuaState.cc (modified) (1 diff)

code/branches/gamestate/data/lua/LuaStateInit.lua

@@ -34 +34 @@
 -- Furthermore the ".lua" extension is appended to the moduleName parameter when looking for the file
 original_require = require
+_REQUIREDNAME = ""
+LuaStateReturnValue = true
 require = function(moduleName)
   if not luaState:fileExists(moduleName .. ".lua") then
@@ -44 +46 @@
   if not _LOADED[moduleName] then
     -- save old value
-    _REQUIREDNAME_OLD = _REQUIREDNAME
+    local _REQUIREDNAME_OLD = _REQUIREDNAME
     _REQUIREDNAME = moduleName
     luaState:doFile(moduleName .. ".lua")
-    _LOADED[moduleName] = LuaStateReturnValue or true
+    _LOADED[moduleName] = LuaStateReturnValue
     -- restore old value
     _REQUIREDNAME = _REQUIREDNAME_OLD

code/branches/gamestate/src/libraries/core/LuaState.cc

@@ -170 +170 @@
                 origin = " originating from " + sourceFileInfo_->filename;
             COUT(1) << "Error in Lua-script" << origin << ": " << lua_tostring(luaState_, -1) << std::endl;
-            // return value is nil
-            lua_pushnil(luaState_);
-        }
-        // push return value because it will get lost since the return value of this function is void
+            // return value is true (not nil!)
+            lua_pushboolean(luaState_, 1);
+        }
+        if (lua_isnil(luaState_, -1))
+        {
+            // Nil return values cause problems
+            lua_pop(luaState_, 1);
+            lua_pushboolean(luaState_, 1);
+        }
+        // Push return value because it will get lost since the return value of this function is void
         lua_setglobal(luaState_, "LuaStateReturnValue");