Changeset 6670

Timestamp:

Apr 1, 2010, 1:46:53 PM (14 years ago)

Author:

rgrieder

Message:

Lua errors in 'doFile', 'includeFile' or 'require' should not be caught in theses functions but rather at the beginning of the Lua call.

Location:

code/branches/gamestates2

Files:

• data/lua/LuaStateInit.lua (modified) (6 diffs)
• src/libraries/core/LuaState.cc (modified) (3 diffs)

code/branches/gamestates2/data/lua/LuaStateInit.lua

@@ -16 +16 @@
 original_dofile = dofile
 dofile = function(filename)
-  luaState:doFile(filename)
+  if not luaState:doFile(filename) then
+    error("Error propagation. Do not display")
+  end
   -- Required because if the file returns a table, it cannot be passed through the C++ function
   return LuaStateReturnValue -- C-injected global variable
@@ -25 +27 @@
 -- to a function provided to the LuaState constructor (in C++)
 include = function(filename)
-  luaState:includeFile(filename)
+  if not luaState:includeFile(filename) then
+    error("Error propagation. Do not display")
+  end
   -- Required because if the file returns a table, it cannot be passed through the C++ function
   return LuaStateReturnValue -- C-injected global variable
@@ -54 +58 @@
     _REQUIREDNAME = moduleName
 
-    luaState:doFile(moduleName .. ".lua")
+    if not luaState:doFile(moduleName .. ".lua") then
+      error("Error propagation. Do not display")
+    end
     -- LuaStateReturnValue is required because if the file returns a table,
     -- it cannot be passed through the C++ function
@@ -66 +72 @@
   return asdf
 end
+
+
+-- Load useful tool functions (like handleDefaultArgument)
+require("Tools")
 
 
@@ -82 +92 @@
 -- General error handler that gets called whenever an error happens at runtime
 errorHandler = function(err)
-  -- Display the error message
   if type(err) == "string" then
+    -- Simply return if the error has already been handled
+    if string.find(err, "Error propagation. Do not display") ~= nil then
+      return err
+    end
+    -- Display the error message
     logMessage(1, "Lua runtime error: "..err)
   end
@@ -92 +106 @@
   else
     -- Fallback: print stack trace
-    logMessage(1, debug.traceback(2))
+    logMessage(3, debug.traceback(""))
   end
   return err -- Hello Lua debugger user! Please type 'set 2' to get to the

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

@@ -201 +201 @@
         case LUA_ERRMEM:    // Memory allocation error
             COUT(1) << "Lua memory allocation error: Consult your dentist immediately!" << std::endl;
-            lua_pop(luaState_, 1); // Remove error message
             break;
         }
@@ -213 +212 @@
             {
             case LUA_ERRRUN: // Runtime error
-                // Remove error string from stack (we already display the error in the
+                // Do nothing (we already display the error in the
                 // 'errorHandler' Lua function in LuaStateInit.lua)
                 break;
@@ -223 +222 @@
                 break;
             }
-            if (error != 0)
-                lua_pop(luaState_, 1); // Remove error message
         }
 
         if (error != 0)
+        {
+            lua_pop(luaState_, 1);  // Remove error message
             lua_pushnil(luaState_); // Push a nil return value
+        }
 
         if (errorHandler != 0)