Changeset 6627

Timestamp:

Mar 28, 2010, 7:45:40 PM (15 years ago)

Author:

rgrieder

Message:

Added Lua debugging support for XML embedded Lua code (even steps into 'include' calls).
The debugger will simply display the output of the Lua tag parser.
Just write 'pause(message)' within a Lua tag and the debugger will be called.

Location:

code/branches/gamestate/src/libraries/core

Files:

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

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

@@ -140 +140 @@
             // The '@' is a Lua convention to identify the chunk name as filename
             chunkname = '@' + sourceFileInfo->filename;
+            
+            // Also fill a map with the actual source code. This is just for the include* commands
+            // where the content of sourceFileInfo->filename doesn't match 'code'
+            this->sourceCodeMap_[sourceFileInfo->filename] = code;
         }
         else
@@ -174 +178 @@
         // Load the old info again
         sourceFileInfo_ = oldSourceFileInfo;
+
+        // Delete source code entry
+        if (sourceFileInfo != NULL)
+            this->sourceCodeMap_.erase(sourceFileInfo->filename);
     }
 
@@ -198 +206 @@
     std::string LuaState::getSourceCode(const std::string& filename)
     {
+        // Try the internal map first to get the actual Lua code
+        // and not just some pseudo Lua-XML code when using include* commands
+        std::map<std::string, std::string>::const_iterator it = this->sourceCodeMap_.find(filename);
+        if (it != this->sourceCodeMap_.end())
+            return it->second;
         shared_ptr<ResourceInfo> info = Resource::getInfo(filename);
         if (info == NULL)

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

@@ -115 +115 @@
         bool bIsRunning_;
         shared_ptr<ResourceInfo> sourceFileInfo_;
+        std::map<std::string, std::string> sourceCodeMap_;
         std::string (*includeParseFunction_)(const std::string&);