Module:Utils: Difference between revisions

← Older edit Newer edit →

@@ Line 15: / Line 15: @@
 -- Check if a table contains x
-function p.table_contains(tbl, x)
+-- Accepts an optional comparison function that accepts two tables, returning
-	for i = 1, #tbl do
+-- true if x and tbl[i] have the same value.
-		if x == tbl[i] then
+function p.table_contains(tbl, x, compare_func)
-			return true
+	if compare_func ~= nil then
+		-- Use compare function
+		for i = 1, #tbl do
+			if compare_func(x, tbl[i]) then
+				return true
+			end
+		end
+	else
+		-- No compare function
+		for i = 1, #tbl do
+			if x == tbl[i] then
+				return true
+			end
 		end
 	end
@@ Line 25: / Line 37: @@
 -- Return the first index with the given value (or nil if not found)
-function p.index_of(array, value)
+-- Accepts an optional comparison function that accepts two tables, returning
-	for i, v in ipairs(array) do
+-- true if v and value have the same value.
-		if v == value then
+function p.index_of(array, value, compare_func)
-			return i
+	if compare_func ~= nil then
+		-- Use compare function
+		for i, v in ipairs(array) do
+			if compare_func(v, value) then
+				return i
+			end
+		end
+	else
+		-- No compare function
+		for i, v in ipairs(array) do
+			if v == value then
+				return i
+			end
 		end
 	end