From 1d833bb80779ed9c9e1d7ec6c7fab231ebf48182 Mon Sep 17 00:00:00 2001
From: Florian Zeitz <florob@babelmonkeys.de>
Date: Fri, 9 Aug 2013 17:48:21 +0200
Subject: Remove all trailing whitespace

---
 util/set.lua | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

(limited to 'util/set.lua')

diff --git a/util/set.lua b/util/set.lua
index 7f45526e..e9dfec1b 100644
--- a/util/set.lua
+++ b/util/set.lua
@@ -1,7 +1,7 @@
 -- Prosody IM
 -- Copyright (C) 2008-2010 Matthew Wild
 -- Copyright (C) 2008-2010 Waqas Hussain
--- 
+--
 -- This project is MIT/X11 licensed. Please see the
 -- COPYING file in the source package for more information.
 --
@@ -40,13 +40,13 @@ function set_mt.__eq(set1, set2)
 			return false;
 		end
 	end
-	
+
 	for item in pairs(set2) do
 		if not set1[item] then
 			return false;
 		end
 	end
-	
+
 	return true;
 end
 function set_mt.__tostring(set)
@@ -65,23 +65,23 @@ end
 function new(list)
 	local items = setmetatable({}, items_mt);
 	local set = { _items = items };
-	
+
 	function set:add(item)
 		items[item] = true;
 	end
-	
+
 	function set:contains(item)
 		return items[item];
 	end
-	
+
 	function set:items()
 		return items;
 	end
-	
+
 	function set:remove(item)
 		items[item] = nil;
 	end
-	
+
 	function set:add_list(list)
 		if list then
 			for _, item in ipairs(list) do
@@ -89,7 +89,7 @@ function new(list)
 			end
 		end
 	end
-	
+
 	function set:include(otherset)
 		for item in pairs(otherset) do
 			items[item] = true;
@@ -101,22 +101,22 @@ function new(list)
 			items[item] = nil;
 		end
 	end
-	
+
 	function set:empty()
 		return not next(items);
 	end
-	
+
 	if list then
 		set:add_list(list);
 	end
-	
+
 	return setmetatable(set, set_mt);
 end
 
 function union(set1, set2)
 	local set = new();
 	local items = set._items;
-	
+
 	for item in pairs(set1._items) do
 		items[item] = true;
 	end
@@ -124,14 +124,14 @@ function union(set1, set2)
 	for item in pairs(set2._items) do
 		items[item] = true;
 	end
-	
+
 	return set;
 end
 
 function difference(set1, set2)
 	local set = new();
 	local items = set._items;
-	
+
 	for item in pairs(set1._items) do
 		items[item] = (not set2._items[item]) or nil;
 	end
@@ -142,13 +142,13 @@ end
 function intersection(set1, set2)
 	local set = new();
 	local items = set._items;
-	
+
 	set1, set2 = set1._items, set2._items;
-	
+
 	for item in pairs(set1) do
 		items[item] = (not not set2[item]) or nil;
 	end
-	
+
 	return set;
 end
 
-- 
cgit v1.2.3


From bd8755411c872988afb0343e0e39492f280d8a90 Mon Sep 17 00:00:00 2001
From: Matthew Wild <mwild1@gmail.com>
Date: Tue, 3 Sep 2013 12:21:43 +0100
Subject: util.set: :items() now returns an iterator instead of the underlying
 table. This is much more efficient than 'for item in set' (which still works
 for now). Current access to _items is generally done directly, this may
 change.

---
 util/set.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'util/set.lua')

diff --git a/util/set.lua b/util/set.lua
index a2df669c..89cd7cf3 100644
--- a/util/set.lua
+++ b/util/set.lua
@@ -75,7 +75,7 @@ function new(list)
 	end
 
 	function set:items()
-		return items;
+		return next, items;
 	end
 
 	function set:remove(item)
-- 
cgit v1.2.3