1 files changed, 77 insertions, 40 deletions

diff --git a/util/stanza.lua b/util/stanza.lua
index 08ef2c9a..de83977f 100644
--- a/util/stanza.lua
+++ b/util/stanza.lua
@@ -44,11 +44,13 @@ module "stanza"
 
 stanza_mt = { __type = "stanza" };
 stanza_mt.__index = stanza_mt;
+local stanza_mt = stanza_mt;
 
 function stanza(name, attr)
-	local stanza = { name = name, attr = attr or {}, tags = {}, last_add = {}};
+	local stanza = { name = name, attr = attr or {}, tags = {} };
 	return setmetatable(stanza, stanza_mt);
 end
+local stanza = stanza;
 
 function stanza_mt:query(xmlns)
 	return self:tag("query", { xmlns = xmlns });
@@ -60,26 +62,27 @@ end
 
 function stanza_mt:tag(name, attrs)
 	local s = stanza(name, attrs);
-	(self.last_add[#self.last_add] or self):add_direct_child(s);
-	t_insert(self.last_add, s);
+	local last_add = self.last_add;
+	if not last_add then last_add = {}; self.last_add = last_add; end
+	(last_add[#last_add] or self):add_direct_child(s);
+	t_insert(last_add, s);
 	return self;
 end
 
 function stanza_mt:text(text)
-	(self.last_add[#self.last_add] or self):add_direct_child(text);
+	local last_add = self.last_add;
+	(last_add and last_add[#last_add] or self):add_direct_child(text);
 	return self;
 end
 
 function stanza_mt:up()
-	t_remove(self.last_add);
+	local last_add = self.last_add;
+	if last_add then t_remove(last_add); end
 	return self;
 end
 
 function stanza_mt:reset()
-	local last_add = self.last_add;
-	for i = 1,#last_add do
-		last_add[i] = nil;
-	end
+	self.last_add = nil;
 	return self;
 end
 
@@ -91,7 +94,8 @@ function stanza_mt:add_direct_child(child)
 end
 
 function stanza_mt:add_child(child)
-	(self.last_add[#self.last_add] or self):add_direct_child(child);
+	local last_add = self.last_add;
+	(last_add and last_add[#last_add] or self):add_direct_child(child);
 	return self;
 end
 
@@ -106,6 +110,14 @@ function stanza_mt:get_child(name, xmlns)
 	end
 end
 
+function stanza_mt:get_child_text(name, xmlns)
+	local tag = self:get_child(name, xmlns);
+	if tag then
+		return tag:get_text();
+	end
+	return nil;
+end
+
 function stanza_mt:child_with_name(name)
 	for _, child in ipairs(self.tags) do
 		if child.name == name then return child; end
@@ -122,17 +134,48 @@ function stanza_mt:children()
 	local i = 0;
 	return function (a)
 			i = i + 1
-			local v = a[i]
-			if v then return v; end
+			return a[i];
 		end, self, i;
 end
-function stanza_mt:childtags()
-	local i = 0;
-	return function (a)
-			i = i + 1
-			local v = self.tags[i]
-			if v then return v; end
-		end, self.tags[1], i;
+
+function stanza_mt:childtags(name, xmlns)
+	xmlns = xmlns or self.attr.xmlns;
+	local tags = self.tags;
+	local start_i, max_i = 1, #tags;
+	return function ()
+		for i = start_i, max_i do
+			local v = tags[i];
+			if (not name or v.name == name)
+			and (not xmlns or xmlns == v.attr.xmlns) then
+				start_i = i+1;
+				return v;
+			end
+		end
+	end;
+end
+
+function stanza_mt:maptags(callback)
+	local tags, curr_tag = self.tags, 1;
+	local n_children, n_tags = #self, #tags;
+	
+	local i = 1;
+	while curr_tag <= n_tags do
+		if self[i] == tags[curr_tag] then
+			local ret = callback(self[i]);
+			if ret == nil then
+				t_remove(self, i);
+				t_remove(tags, curr_tag);
+				n_children = n_children - 1;
+				n_tags = n_tags - 1;
+			else
+				self[i] = ret;
+				tags[i] = ret;
+			end
+			i = i + 1;
+			curr_tag = curr_tag + 1;
+		end
+	end
+	return self;
 end
 
 local xml_escape
@@ -200,7 +243,7 @@ function stanza_mt.get_error(stanza)
 	end
 	type = error_tag.attr.type;
 	
-	for child in error_tag:children() do
+	for child in error_tag:childtags() do
 		if child.attr.xmlns == xmlns_stanzas then
 			if not text and child.name == "text" then
 				text = child:get_text();
@@ -212,7 +255,7 @@ function stanza_mt.get_error(stanza)
 			end
 		end
 	end
-	return type, condition or "undefined-condition", text or "";
+	return type, condition or "undefined-condition", text;
 end
 
 function stanza_mt.__add(s1, s2)
@@ -271,39 +314,33 @@ function deserialize(stanza)
 				end
 			end
 			stanza.tags = tags;
-			if not stanza.last_add then
-				stanza.last_add = {};
-			end
 		end
 	end
 	
 	return stanza;
 end
 
-function clone(stanza)
-	local lookup_table = {};
-	local function _copy(object)
-		if type(object) ~= "table" then
-			return object;
-		elseif lookup_table[object] then
-			return lookup_table[object];
-		end
-		local new_table = {};
-		lookup_table[object] = new_table;
-		for index, value in pairs(object) do
-			new_table[_copy(index)] = _copy(value);
+local function _clone(stanza)
+	local attr, tags = {}, {};
+	for k,v in pairs(stanza.attr) do attr[k] = v; end
+	local new = { name = stanza.name, attr = attr, tags = tags };
+	for i=1,#stanza do
+		local child = stanza[i];
+		if child.name then
+			child = _clone(child);
+			t_insert(tags, child);
 		end
-		return setmetatable(new_table, getmetatable(object));
+		t_insert(new, child);
 	end
-	
-	return _copy(stanza)
+	return setmetatable(new, stanza_mt);
 end
+clone = _clone;
 
 function message(attr, body)
 	if not body then
 		return stanza("message", attr);
 	else
-		return stanza("message", attr):tag("body"):text(body);
+		return stanza("message", attr):tag("body"):text(body):up();
 	end
 end
 function iq(attr)