Changeset 6626 for code/branches/gamestate/src/libraries

Timestamp:

Mar 28, 2010, 7:16:12 PM (15 years ago)

Author:

rgrieder

Message:

Modified Debugger.lua so we can debug any Lua files from our Resources.
Debugging strings loaded with loadstring() cannot be debugged (not supported by Debugger.lua, it always assumes files).

Location:

code/branches/gamestate/src/libraries/core

Files:

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

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

@@ -135 +135 @@
 
         std::string chunkname;
-        if (sourceFileInfo != NULL && !sourceFileInfo->fileSystemPath.empty())
+        if (sourceFileInfo != NULL)
         {
             // Provide lua_load with the filename for debug purposes
             // The '@' is a Lua convention to identify the chunk name as filename
-            chunkname = '@' + sourceFileInfo->fileSystemPath;
-        }
-        else
-        {
-            // Use the beginning of the code string to identify the chunk
-            chunkname = code.substr(0, 80);
+            chunkname = '@' + sourceFileInfo->filename;
+        }
+        else
+        {
+            // Use the code string to identify the chunk
+            chunkname = code;
         }
 
@@ -195 +195 @@
     }
 
+    //! Returns the content of a file
+    std::string LuaState::getSourceCode(const std::string& filename)
+    {
+        shared_ptr<ResourceInfo> info = Resource::getInfo(filename);
+        if (info == NULL)
+            return "";
+        else
+            return Resource::open(info)->getAsString();
+    }
+
 #if LUA_VERSION_NUM != 501
     const char * LuaState::lua_Chunkreader(lua_State *L, void *data, size_t *size)

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

@@ -80 +80 @@
         void luaLog(unsigned int level, const std::string& message); // tolua_export
         bool fileExists(const std::string& filename); // tolua_export
+        std::string getSourceCode(const std::string& filename); // tolua_export
 
         const std::stringstream& getOutput() const { return output_; }