Merge pull request #970 from Blizzard/table-fix-indexof

Table fix indexof
premake · Dec 12, 2017 · 08c768d · 08c768d
2 parents 056e539 + 177c2f1
commit 08c768d
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/src/base/rule.lua b/src/base/rule.lua
@@ -130,7 +130,7 @@
 
 		-- enum?
 		if prop.values then
-			local i = table.indexof(prop.values, value)
+			local i = table.findKeyByValue(prop.values, value)
 			if i ~= nil then
 				return tostring(i)
 			else
@@ -185,7 +185,7 @@
 
 		-- enum?
 		if prop.values then
-			local i = table.indexof(prop.values, value)
+			local i = table.findKeyByValue(prop.values, value)
 			if i ~= nil then
 				return prop.switch .. tostring(i)
 			else

diff --git a/src/base/table.lua b/src/base/table.lua
@@ -197,14 +197,27 @@
 --
 
 	function table.indexof(tbl, obj)
-		for k, v in pairs(tbl) do
+		for k, v in ipairs(tbl) do
 			if v == obj then
 				return k
 			end
 		end
 	end
 
 
+--
+-- Looks for an object within a table. Returns the key if found,
+-- or nil if the object could not be found.
+--
+
+	function table.findKeyByValue(tbl, obj)
+		for k, v in pairs(tbl) do
+			if v == obj then
+				return k
+			end
+		end
+	end
+
 
 ---
 -- Insert a new value into a table in the position after the specified