# HG changeset patch # User Matthew Wild # Date 1298360272 0 # Node ID 676588aed2d75894692ca1f6b08546a13940c938 # Parent 4d52812d018dbecc5e0504f82449f5508a9524ed util.stanza: Remove childtags and rename matching_tags -> childtags (they are API-compatible) diff -r 4d52812d018d -r 676588aed2d7 util/stanza.lua --- a/util/stanza.lua Sun Feb 20 20:11:52 2011 +0500 +++ b/util/stanza.lua Tue Feb 22 07:37:52 2011 +0000 @@ -138,29 +138,20 @@ 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)