Changeset 6763 for code/trunk

Timestamp:

Apr 19, 2010, 6:09:10 PM (15 years ago)

Author:

rgrieder

Message:

Using our own error handler (including the debugger) for Lua code executed through CEGUILuaFunctor.

Location:

code/trunk/src/libraries/core

Files:

• GUIManager.cc (modified) (1 diff)
• LuaState.cc (modified) (2 diffs)
• LuaState.h (modified) (1 diff)

code/trunk/src/libraries/core/GUIManager.cc

@@ -133 +133 @@
         luaState_->setDefaultResourceInfo(this->rootFileInfo_);
         scriptModule_.reset(new LuaScriptModule(luaState_->getInternalLuaState()));
+        scriptModule_->setDefaultPCallErrorHandler(LuaState::ERROR_HANDLER_NAME);
 
         // Create our own logger to specify the filepath

code/trunk/src/libraries/core/LuaState.cc

@@ -47 +47 @@
     LuaState::ToluaInterfaceMap LuaState::toluaInterfaces_s;
     std::vector<LuaState*> LuaState::instances_s;
+
+    const std::string LuaState::ERROR_HANDLER_NAME = "errorHandler";
 
     // Do this after declaring toluaInterfaces_s and instances_s to avoid larger problems
@@ -177 +179 @@
 
         // Push custom error handler that uses the debugger
-        lua_getglobal(this->luaState_, "errorHandler");
+        lua_getglobal(this->luaState_, ERROR_HANDLER_NAME.c_str());
         int errorHandler = lua_gettop(luaState_);
         if (lua_isnil(this->luaState_, -1))

code/trunk/src/libraries/core/LuaState.h

@@ -100 +100 @@
         static void closeToluaInterfaces(lua_State* state);
 
+        static const std::string ERROR_HANDLER_NAME;
+
     private:
         shared_ptr<ResourceInfo> getFileInfo(const std::string& filename);