Module:TableTools: Difference between revisions

← Older edit

@@ Line 460: / Line 460: @@
 -- inArray
 --
--- Returns true if searchElement is a member of the array, and false otherwise.
+-- Returns true if valueToFind is a member of the array, and false otherwise.
--- Equivalent to JavaScript array.includes(searchElement) or
--- array.includes(searchElement, fromIndex), except fromIndex is 1 indexed
 ------------------------------------------------------------------------------------
-function p.inArray(array, searchElement, fromIndex)
+function p.inArray(arr, valueToFind)
-	checkType("inArray", 1, array, "table")
+	checkType("inArray", 1, arr, "table")
-	-- if searchElement is nil, error?
+	-- if valueToFind is nil, error?
-	fromIndex = tonumber(fromIndex)
+	for _, v in ipairs(arr) do
-	if fromIndex then
+		if v == valueToFind then
-		if (fromIndex < 0) then
+			return true
-			fromIndex = #array + fromIndex + 1
-		end
-		if fromIndex < 1 then fromIndex = 1 end
-		for _, v in ipairs({unpack(array, fromIndex)}) do
-			if v == searchElement then
-				return true
-			end
-		end
-	else
-		for _, v in pairs(array) do
-			if v == searchElement then
-				return true
-			end
 		end
 	end