X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=util%2Ftemplate.lua;h=66d4fca7ae9084b2a41a1d76c2dee4f662f82eb8;hb=1d89ef70547703ae64a530d3e03b46cd17c3d9ed;hp=c143a216ee2009b0445b5a03d855088238984891;hpb=a5b2763f679d9767e740e49445f571ca1a1d345d;p=prosody.git

diff --git a/util/template.lua b/util/template.lua
index c143a216..66d4fca7 100644
--- a/util/template.lua
+++ b/util/template.lua
@@ -1,112 +1,97 @@
 
-local t_insert = table.insert;
-local st = require "util.stanza";
-local lxp = require "lxp";
+local stanza_mt = require "util.stanza".stanza_mt;
 local setmetatable = setmetatable;
 local pairs = pairs;
+local ipairs = ipairs;
 local error = error;
-local s_gsub = string.gsub;
-
-local print = print;
+local loadstring = loadstring;
+local debug = debug;
+local t_remove = table.remove;
+local parse_xml = require "util.xml".parse;
 
 module("template")
 
-local function process_stanza(stanza, ops)
-	-- process attrs
-	for key, val in pairs(stanza.attr) do
-		if val:match("{[^}]*}") then
-			t_insert(ops, {stanza.attr, key, val});
-		end
-	end
-	-- process children
-	local i = 1;
-	while i <= #stanza do
+local function trim_xml(stanza)
+	for i=#stanza,1,-1 do
 		local child = stanza[i];
 		if child.name then
-			process_stanza(child, ops);
-		elseif child:match("{[^}]*}") then -- text
-			t_insert(ops, {stanza, i, child});
+			trim_xml(child);
+		else
+			child = child:gsub("^%s*", ""):gsub("%s*$", "");
+			stanza[i] = child;
+			if child == "" then t_remove(stanza, i); end
 		end
-		i = i + 1;
 	end
 end
 
-local parse_xml = (function()
-	local ns_prefixes = {
-		["http://www.w3.org/XML/1998/namespace"] = "xml";
-	};
-	local ns_separator = "\1";
-	local ns_pattern = "^([^"..ns_separator.."]*)"..ns_separator.."?(.*)$";
-	return function(xml)
-		local handler = {};
-		local stanza = st.stanza("root");
-		function handler:StartElement(tagname, attr)
-			local curr_ns,name = tagname:match(ns_pattern);
-			if name == "" then
-				curr_ns, name = "", curr_ns;
-			end
-			if curr_ns ~= "" then
-				attr.xmlns = curr_ns;
-			end
-			for i=1,#attr do
-				local k = attr[i];
-				attr[i] = nil;
-				local ns, nm = k:match(ns_pattern);
-				if nm ~= "" then
-					ns = ns_prefixes[ns]; 
-					if ns then 
-						attr[ns..":"..nm] = attr[k];
-						attr[k] = nil;
-					end
-				end
-			end
-			stanza:tag(name, attr);
-		end
-		function handler:CharacterData(data)
-			data = data:gsub("^%s*", ""):gsub("%s*$", "");
-			stanza:text(data);
+local function create_string_string(str)
+	str = ("%q"):format(str);
+	str = str:gsub("{([^}]*)}", function(s)
+		return '"..(data["'..s..'"]or"").."';
+	end);
+	return str;
+end
+local function create_attr_string(attr, xmlns)
+	local str = '{';
+	for name,value in pairs(attr) do
+		if name ~= "xmlns" or value ~= xmlns then
+			str = str..("[%q]=%s;"):format(name, create_string_string(value));
 		end
-		function handler:EndElement(tagname)
-			stanza:up();
+	end
+	return str..'}';
+end
+local function create_clone_string(stanza, lookup, xmlns)
+	if not lookup[stanza] then
+		local s = ('setmetatable({name=%q,attr=%s,tags={'):format(stanza.name, create_attr_string(stanza.attr, xmlns));
+		-- add tags
+		for i,tag in ipairs(stanza.tags) do
+			s = s..create_clone_string(tag, lookup, stanza.attr.xmlns)..";";
 		end
-		local parser = lxp.new(handler, "\1");
-		local ok, err, line, col = parser:parse(xml);
-		if ok then ok, err, line, col = parser:parse(); end
-		--parser:close();
-		if ok then
-			return stanza.tags[1];
-		else
-			return ok, err.." (line "..line..", col "..col..")";
+		s = s..'};';
+		-- add children
+		for i,child in ipairs(stanza) do
+			if child.name then
+				s = s..create_clone_string(child, lookup, stanza.attr.xmlns)..";";
+			else
+				s = s..create_string_string(child)..";"
+			end
 		end
-	end;
-end)();
+		s = s..'}, stanza_mt)';
+		s = s:gsub('%.%.""', ""):gsub('([=;])""%.%.', "%1"):gsub(';"";', ";"); -- strip empty strings
+		local n = #lookup + 1;
+		lookup[n] = s;
+		lookup[stanza] = "_"..n;
+	end
+	return lookup[stanza];
+end
+local function create_cloner(stanza, chunkname)
+	local lookup = {};
+	local name = create_clone_string(stanza, lookup, "");
+	local f = "local setmetatable,stanza_mt=...;return function(data)";
+	for i=1,#lookup do
+		f = f.."local _"..i.."="..lookup[i]..";";
+	end
+	f = f.."return "..name..";end";
+	local f,err = loadstring(f, chunkname);
+	if not f then error(err); end
+	return f(setmetatable, stanza_mt);
+end
 
-local function create_template(text)
+local template_mt = { __tostring = function(t) return t.name end };
+local function create_template(templates, text)
 	local stanza, err = parse_xml(text);
 	if not stanza then error(err); end
-	local ops = {};
-	process_stanza(stanza, ops);
-	ops.stanza = stanza;
-	
-	local template = {};
-	function template.apply(data)
-		local newops = st.clone(ops);
-		for i=1,#newops do
-			local op = newops[i];
-			local t, k, v = op[1], op[2], op[3];
-			t[k] = s_gsub(v, "{([^}]*)}", data);
-		end
-		return newops.stanza;
-	end
+	trim_xml(stanza);
+
+	local info = debug.getinfo(3, "Sl");
+	info = info and ("template(%s:%d)"):format(info.short_src:match("[^\\/]*$"), info.currentline) or "template(unknown)";
+
+	local template = setmetatable({ apply = create_cloner(stanza, info), name = info, text = text }, template_mt);
+	templates[text] = template;
 	return template;
 end
 
-local templates = setmetatable({}, { __mode = 'k' });
+local templates = setmetatable({}, { __mode = 'k', __index = create_template });
 return function(text)
-	local template = templates[text];
-	if not template then
-		template = create_template(text);
-		templates[text] = template;
-	end
-	return template;
+	return templates[text];
 end;