From 9bdda60fea20ca61a51fdb1e0272027b099bd998 Mon Sep 17 00:00:00 2001
From: Mauro Iazzi <mauro.iazzi@gmail.com>
Date: Sat, 3 May 2008 22:14:36 +0200
Subject: [PATCH] indented xml.lua

---
 new/xml.lua | 162 ++++++++++++++++++++++++++++++------------------------------
 1 file changed, 81 insertions(+), 81 deletions(-)
 rewrite new/xml.lua (88%)

diff --git a/new/xml.lua b/new/xml.lua
dissimilarity index 88%
index 8f85ad6..6d2a09e 100644
--- a/new/xml.lua
+++ b/new/xml.lua
@@ -1,81 +1,81 @@
-#!/usr/bin/lua
-
-local parseargs, collect, strip_escapes
-
-strip_escapes = function (s)
-	s = string.gsub(s, '&gt;', '>')
-	s = string.gsub(s, '&lt;', '<')
-	return s
-end
-
-
-function parseargs(s)
-  local arg = {}
-  string.gsub(s, "([%w_]+)=([\"'])(.-)%2", function (w, _, a)
-    arg[strip_escapes(w)] = strip_escapes(a)
-  end)
-  return arg
-end
-    
-function collect(s)
-  local stack = {}
-  local top = {}
-  table.insert(stack, top)
-  local ni,c,label,xarg, empty
-  local i, j = 1, 1
-  while true do
-    ni,j,c,label,xarg, empty = string.find(s, "<(%/?)(%w+)(.-)(%/?)>", j)
-    if not ni then break end
-    local text = string.sub(s, i, ni-1)
-    if not string.find(text, "^%s*$") then
-      table.insert(top, text)
-    end
-    if empty == "/" then  -- empty element tag
-      table.insert(top, {label=label, xarg=parseargs(xarg), empty=1})
-    elseif c == "" then   -- start tag
-      top = {label=label, xarg=parseargs(xarg)}
-      table.insert(stack, top)   -- new level
-    else  -- end tag
-      local toclose = table.remove(stack)  -- remove top
-      top = stack[#stack]
-      if #stack < 1 then
-        error("nothing to close with "..label)
-      end
-      if toclose.label ~= label then
-        error("trying to close "..toclose.label.." with "..label)
-      end
-      table.insert(top, toclose)
-			if toclose.xarg.name then
-				top.byname = top.byname or {}
-				local overload = top.byname[toclose.xarg.name]
-				if overload then
-					-- FIXME: most probably a case of overload: check
-					if overload.tag~='Overloaded' then
-						--print('created overload '..toclose.xarg.name)
-						overload = { tag='Overloaded', xargs={ name=toclose.xarg.name }, overload }
-						top.byname[toclose.xarg.name] = overload
-					end
-					table.insert(overload, toclose)
-					--print('used overload '..toclose.xarg.name)
-				else
-					top.byname[toclose.xarg.name] = toclose
-				end
-			end
-			if toclose.xarg.id then
-							stack[1].byid = stack[1].byid or {}
-							stack[1].byid[toclose.xarg.id] = toclose
-			end
-    end
-    i = j+1
-  end
-  local text = string.sub(s, i)
-  if not string.find(text, "^%s*$") then
-    table.insert(stack[#stack], text)
-  end
-  if #stack > 1 then
-    error("unclosed "..stack[stack.n].label)
-  end
-  return stack[1]
-end
-
-return collect
+#!/usr/bin/lua
+
+local parseargs, collect, strip_escapes
+
+strip_escapes = function (s)
+	s = string.gsub(s, '&gt;', '>')
+	s = string.gsub(s, '&lt;', '<')
+	return s
+end
+
+
+function parseargs(s)
+	local arg = {}
+	string.gsub(s, "([%w_]+)=([\"'])(.-)%2", function (w, _, a)
+		arg[strip_escapes(w)] = strip_escapes(a)
+	end)
+	return arg
+end
+
+function collect(s)
+	local stack = {}
+	local top = {}
+	table.insert(stack, top)
+	local ni,c,label,xarg, empty
+	local i, j = 1, 1
+	while true do
+		ni,j,c,label,xarg, empty = string.find(s, "<(%/?)(%w+)(.-)(%/?)>", j)
+		if not ni then break end
+		local text = string.sub(s, i, ni-1)
+		if not string.find(text, "^%s*$") then
+			table.insert(top, text)
+		end
+		if empty == "/" then  -- empty element tag
+			table.insert(top, {label=label, xarg=parseargs(xarg), empty=1})
+		elseif c == "" then   -- start tag
+			top = {label=label, xarg=parseargs(xarg)}
+			table.insert(stack, top)   -- new level
+		else  -- end tag
+		local toclose = table.remove(stack)  -- remove top
+		top = stack[#stack]
+		if #stack < 1 then
+			error("nothing to close with "..label)
+		end
+		if toclose.label ~= label then
+			error("trying to close "..toclose.label.." with "..label)
+		end
+		table.insert(top, toclose)
+		if toclose.xarg.name then
+			top.byname = top.byname or {}
+			local overload = top.byname[toclose.xarg.name]
+			if overload then
+				-- FIXME: most probably a case of overload: check
+				if overload.tag~='Overloaded' then
+					--print('created overload '..toclose.xarg.name)
+					overload = { tag='Overloaded', xargs={ name=toclose.xarg.name }, overload }
+					top.byname[toclose.xarg.name] = overload
+				end
+				table.insert(overload, toclose)
+				--print('used overload '..toclose.xarg.name)
+			else
+				top.byname[toclose.xarg.name] = toclose
+			end
+		end
+		if toclose.xarg.id then
+			stack[1].byid = stack[1].byid or {}
+			stack[1].byid[toclose.xarg.id] = toclose
+		end
+	end
+	i = j+1
+end
+local text = string.sub(s, i)
+if not string.find(text, "^%s*$") then
+	table.insert(stack[#stack], text)
+end
+if #stack > 1 then
+	error("unclosed "..stack[stack.n].label)
+end
+return stack[1]
+end
+
+return collect
-- 
2.11.4.GIT