Simplify func.iterate

func.lua

@@ -35,17 +35,14 @@ function values(...)
 	return function() return unpack(args) end
 end
 
--- Equivalent to `for x, y, z in iterator(...) do callback(x, y, z) end`
+-- Equivalent to `for x, y, z in iterator, state, ... do callback(x, y, z) end`
-function iterate(callback, iterator, ...)
+function iterate(callback, iterator, state, ...)
-	local function _iterate(iterable, state, ...)
+	local function loop(...)
-		local function loop(...)
+		if ... == nil then return end
-			if ... == nil then return end
+		callback(...)
-			callback(...)
+		return loop(iterator(state, ...))
-			return loop(iterable(state, ...))
-		end
-		return loop(iterable(state, ...))
 	end
-	return _iterate(iterator(...))
+	return loop(iterator(state, ...))
 end
 
 function for_generator(caller, ...)

test.lua

@@ -33,7 +33,7 @@ do
 		assert(tab[key] == value)
 		tab[key] = nil
 	end
-	func.iterate(check_entry, pairs, tab)
+	func.iterate(check_entry, pairs(tab))
 	assert(next(tab) == nil)
 
 	tab = {a = 1, b = 2}