Changeset 10264 for code/trunk/src/libraries/core/LuaState.h

Timestamp:

Feb 11, 2015, 10:56:26 AM (9 years ago)

Author:

muemart

Message:

Various fixes and improvements in the Loader (and LuaState)

• When there's lua code in the xml, the error message now says where exactly the error is coming from (file and line)
• When there's an error in the loader when reading xml, the full xml file gets dumped to the temporary directory for inspection
• Fix and simplify detection of lua tags
• Make sure the reported line in an xml parsing error is useful

File:

• code/trunk/src/libraries/core/LuaState.h (modified) (2 diffs)

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

@@ -94 +94 @@
         void clearOutput() { output_.clear(); } // tolua_export
 
+        void setTraceMap(shared_ptr<std::vector<std::vector<std::pair<std::string, size_t>>>> map)
+            { map->push_back(std::vector<std::pair<std::string, size_t>>()); lineTrace_ = map; }
+
         void setIncludeParser(std::string (*function)(const std::string&)) { includeParseFunction_ = function; }
         lua_State* getInternalLuaState() { return luaState_; }
@@ -113 +116 @@
     private:
         shared_ptr<ResourceInfo> getFileInfo(const std::string& filename);
-
+        shared_ptr<std::vector<std::vector<std::pair<std::string, size_t>>>> lineTrace_;
+        
         std::stringstream output_;
         lua_State* luaState_;