X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=util%2Fstanza.lua;h=600212a4d252470ee5dde1e6488ad8c0992da496;hb=754c9b6fa40f37d59ef23eecdd992dd09ae44da8;hp=7d1f569307a30feeff94dd44fe42fbc7766c6ff8;hpb=7d0d2419c6d4bb99a4bcf32f8aa866a4090a7397;p=prosody.git

diff --git a/util/stanza.lua b/util/stanza.lua
index 7d1f5693..600212a4 100644
--- a/util/stanza.lua
+++ b/util/stanza.lua
@@ -138,29 +138,20 @@ function stanza_mt:children()
 		end, self, i;
 end
 
-function stanza_mt:matching_tags(name, xmlns)
+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
-				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
+		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, tags, 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;
+		end
+	end;
 end
 
 function stanza_mt:maptags(callback)
@@ -267,11 +258,6 @@ function stanza_mt.get_error(stanza)
 	return type, condition or "undefined-condition", text;
 end
 
-function stanza_mt.__add(s1, s2)
-	return s1:add_direct_child(s2);
-end
-
-
 do
 	local id = 0;
 	function new_id()
@@ -329,24 +315,21 @@ function deserialize(stanza)
 	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