Changeset 6746 for code/trunk/data/lua

Timestamp:

Apr 16, 2010, 2:50:16 PM (14 years ago)

Author:

rgrieder

Message:

Merged gamestates2 branch back to trunk.
This brings in some heavy changes in the GUI framework.
It should also fix problems with triggered asserts in the InputManager.

Note: PickupInventory does not seem to work —> Segfault when showing because before, the owner in GUIOverlay::setGUIName is already NULL.
I haven't tested it before, so I can't tell whether it's my changes.

Location:

code/trunk

Files:

• . (modified) (1 prop)
• data/lua/Debugger.lua (copied) (copied from code/branches/gamestates2/data/lua/Debugger.lua)
• data/lua/LuaStateInit.lua (modified) (3 diffs)
• data/lua/Strict.lua (copied) (copied from code/branches/gamestates2/data/lua/Strict.lua)
• data/lua/Tools.lua (copied) (copied from code/branches/gamestates2/data/lua/Tools.lua)

code/trunk/data/lua/LuaStateInit.lua

@@ -1 +1 @@
 -- Note: luaState is a pointer to the LuaState instance that created this lua state
 
--- Save original print function in debug
-debug = print
-
 -- Redirect print to the C++ print function
+original_print = print
 print = function(s)
   luaState:luaPrint(s)
@@ -13 +11 @@
   luaState:luaLog(level, message)
 end
+cout = logMessage
 
 -- Redirect dofile in order to load with the resource manager
-doFile = function(filename)
-  luaState:doFile(filename)
-  -- Required because the C++ function cannot return whatever might be on the stack
+original_dofile = dofile
+dofile = function(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
 end
-original_dofile = dofile
-dofile = doFile
+doFile = dofile
 
 -- Create includeFile function that preparses the file according
 -- to a function provided to the LuaState constructor (in C++)
 include = function(filename)
-  luaState:includeFile(filename)
-  -- Required because the C++ function cannot return whatever might be on the stack
+  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
 end
@@ -34 +37 @@
 -- The loaded modules are then stored with their names (where name has no .lua extension)
 -- Furthermore the ".lua" extension is appended to the moduleName parameter when looking for the file
-old_require = require
+original_require = require
+_REQUIREDNAME = ""
+LuaStateReturnValue = true
 require = function(moduleName)
   if not luaState:fileExists(moduleName .. ".lua") then
+    logMessage(2, "Warning: Lua function require() could not find file '" .. moduleName .. ".lua' ")
     return nil
   end
+
   if not _LOADED then
     _LOADED = {}
   end
+  if not _LOADED_RETURN_VALUES then
+      _LOADED_RETURN_VALUES = {}
+  end
+
   if not _LOADED[moduleName] then
-    -- save old value
-    _REQUIREDNAME_OLD = _REQUIREDNAME
+    -- save old value for the required name
+    local _REQUIREDNAME_OLD = _REQUIREDNAME
     _REQUIREDNAME = moduleName
-    luaState:doFile(moduleName .. ".lua")
-    _LOADED[moduleName] = LuaStateReturnValue or true
+
+    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
+    _LOADED_RETURN_VALUES[moduleName] = LuaStateReturnValue
+    _LOADED[moduleName] = true
+
     -- restore old value
     _REQUIREDNAME = _REQUIREDNAME_OLD
   end
-  return _LOADED[moduleName]
+  local asdf = _LOADED_RETURN_VALUES[moduleName]
+  return asdf
 end
+
+
+-- Load useful tool functions (like handleDefaultArgument)
+require("Tools")
+
+
+-- Include command line debugger for lua 5.1
+-- Note: It doesn't work if the IOConsole was started. Then we replace pause() with a warning
+if _VERSION ~= "Lua 5.0"  and not luaState:usingIOConsole() then
+  require("Debugger")
+else
+  -- Fallback pause function
+  pause = function()
+    logMessage(2, [["Warning: debug() called in Lua, but Debugger is not active.
+Do you have the IOConsole disabled and are you using Lua version 5.1?"]])
+  end
+end
+
+-- General error handler that gets called whenever an error happens at runtime
+errorHandler = function(err)
+  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
+
+  -- Start debugger if possible
+  if _LOADED and _LOADED["Debugger"] ~= nil then
+    pause()
+  else
+    -- Fallback: print stack trace
+    logMessage(3, debug.traceback(""))
+  end
+  return err -- Hello Lua debugger user! Please type 'set 2' to get to the
+             -- actual position in the stack where the error occurred
+end
+
 
 -- Convenience function for console commands