Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions xmlSimple.lua
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module(..., package.seeall)
local XmlLib = {}

---------------------------------------------------------------------------------
---------------------------------------------------------------------------------
Expand All @@ -17,7 +17,7 @@ module(..., package.seeall)
--
---------------------------------------------------------------------------------
---------------------------------------------------------------------------------
function newParser()
function XmlLib.newParser()

XmlParser = {};

Expand Down Expand Up @@ -51,14 +51,14 @@ function newParser()
end

function XmlParser:ParseArgs(node, s)
string.gsub(s, "(%w+)=([\"'])(.-)%2", function(w, _, a)
string.gsub(s, "([%w_]+)=([\"'])(.-)%2", function(w, _, a)
node:addProperty(w, self:FromXmlString(a))
end)
end

function XmlParser:ParseXmlText(xmlText)
local stack = {}
local top = newNode()
local top = XmlLib.newNode()
table.insert(stack, top)
local ni, c, label, xarg, empty
local i, j = 1, 1
Expand All @@ -71,11 +71,11 @@ function newParser()
stack[#stack]:setValue(lVal)
end
if empty == "/" then -- empty element tag
local lNode = newNode(label)
local lNode = XmlLib.newNode(label)
self:ParseArgs(lNode, xarg)
top:addChild(lNode)
elseif c == "" then -- start tag
local lNode = newNode(label)
local lNode = XmlLib.newNode(label)
self:ParseArgs(lNode, xarg)
table.insert(stack, lNode)
top = lNode
Expand Down Expand Up @@ -121,7 +121,7 @@ function newParser()
return XmlParser
end

function newNode(name)
function XmlLib.newNode(name)
local node = {}
node.___value = nil
node.___name = name
Expand Down Expand Up @@ -167,3 +167,5 @@ function newNode(name)

return node
end

return XmlLib