Module:Fun - Revision history

Erutuon: fix filter

2019-09-17T21:55:38Z

fix filter

← Previous revision		Revision as of 21:55, 17 September 2019
Line 254:		Line 254:
	local iter, state, start_value = getIteratorTriplet("filter", 2, ...)		local iter, state, start_value = getIteratorTriplet("filter", 2, ...)
	for val1, val2 in iter, state, start_value do		for val1, val2 in iter, state, start_value do
	if func(v2, v1, state) then		if func(val2, val1, state) then
	new_i = new_i + 1		new_i = new_i + 1
	new_t[new_i] = v		new_t[new_i] = val1
	end		end
	end		end

Erutuon: add a second version of indexOf

2018-07-06T04:47:57Z

add a second version of indexOf

@@ Line 222: / Line 222: @@
 function p.indexOf(func, ...)
 	local iter, state, start_value = getIteratorTriplet("indexOf", 2, ...)
-		if func(val2, val1, state) then
+	if type(func) == "function" then
 		end
 	end

Erutuon: add a "keep original keys" variant of map, to use when mutating non-sequences

2018-07-04T19:00:03Z

add a "keep original keys" variant of map, to use when mutating non-sequences

@@ Line 84: / Line 84: @@
 -- Any need for map that retains original keys, rather than creating an array?
-function p.map(func, ...)
+function p.map(func, keepOriginalKeys, ...)
 	checkType("map", 1, func, "function")
-	local array = {}
+	local iter, state, start_value
-	local iter, state, start_value = getIteratorTriplet("map", 2, ...)
+		iter, state, start_value = getIteratorTriplet("map", 3, ...)
 	end
 end

Erutuon: indexOf

2018-07-04T18:22:08Z

indexOf

← Previous revision		Revision as of 18:22, 4 July 2018
Line 206:		Line 206:

	return true		return true
			end

			function p.indexOf(func, ...)
			checkType("some", 1, func, "function")

			local iter, state, start_value = getIteratorTriplet("indexOf", 2, ...)
			for val1, val2 in iter, state, start_value do
			if func(val2, val1, state) then
			return val1
			end
			end

			return nil
	end		end

Erutuon: pass "state" to lambda functions

2018-07-02T02:49:02Z

pass "state" to lambda functions

← Previous revision		Revision as of 02:49, 2 July 2018
Line 44:		Line 44:

	return iterator		return iterator
	end

	local function getIterator(iterable)
	return type(iterable) == "string" and iterString
	or iterable[1] ~= nil and ipairs
	or pairs
	end		end

Line 95:		Line 89:
	local array = {}		local array = {}
	local i = 0		local i = 0
	~~for~~ ~~val1~~, ~~val2~~ in getIteratorTriplet("map", 2, ...) do		local iter, state, start_value = getIteratorTriplet("map", 2, ...)
		⚫	for val1, val2 in iter, state, start_value do
	i = i + 1		i = i + 1
	array[i] = func(val2, val1)		array[i] = func(val2, val1, state)
	end		end
	return array		return array
Line 106:		Line 101:
	local function fold(func, result, ...)		local function fold(func, result, ...)
	checkType("fold", 1, func, "function")		checkType("fold", 1, func, "function")
	~~for~~ ~~val1~~, ~~val2~~ in getIteratorTriplet('fold', 3, ...) do		local iter, state, start_value = getIteratorTriplet("fold", 3, ...)
			for val1, val2 in iter, state, start_value do
	result = func(result, val2, val1)		result = func(result, val2, val1, state)
	end		end
	return result		return result
Line 130:		Line 126:
	checkType("forEach", 1, func, "function")		checkType("forEach", 1, func, "function")

	~~for~~ ~~val1~~, ~~val2~~ in getIteratorTriplet("forEach", 2, ...) do		local iter, state, start_value = getIteratorTriplet("forEach", 2, ...)
			for val1, val2 in iter, state, start_value do
	func(val2, val1)		func(val2, val1, state)
	end		end
	return nil		return nil
Line 186:		Line 183:
	checkType("some", 1, func, "function")		checkType("some", 1, func, "function")

	~~for~~ ~~val1~~, ~~val2~~ in getIteratorTriplet("some", 2, ...) do		local iter, state, start_value = getIteratorTriplet("some", 2, ...)
			for val1, val2 in iter, state, start_value do
	if func(val2, val1) then		if func(val2, val1, state) then
	return true		return true
	end		end
Line 197:		Line 195:
	-- all(function(val) return val % 2 == 0 end,		-- all(function(val) return val % 2 == 0 end,
	-- { 2, 4, 8, 10, 12 }) --> true		-- { 2, 4, 8, 10, 12 }) --> true
	function p.all(func, t)		function p.all(func, ...)
	checkType("some", 1, func, "function")		checkType("some", 1, func, "function")

			local iter, state, start_value = getIteratorTriplet("all", 2, ...)
⚫	for val1, val2 in ~~ipairs(t)~~ do
			for val1, val2 in iter, state, start_value do
	if not func(val2, val1) then		if not func(val2, val1, state) then
	return false		return false
	end		end
Line 215:		Line 214:
	local new_t = {}		local new_t = {}
	local new_i = 0		local new_i = 0
	~~for~~ v1, v2 in getIteratorTriplet(...) do		local iter, state, start_value = getIteratorTriplet("filter", 2, ...)
			for val1, val2 in iter, state, start_value do
	if func(v2, v1) then		if func(v2, v1, state) then
	new_i = new_i + 1		new_i = new_i + 1
	new_t[new_i] = v		new_t[new_i] = v

Erutuon: generalize all functions

2018-07-02T02:41:59Z

generalize all functions

← Previous revision		Revision as of 02:41, 2 July 2018
Line 88:		Line 88:
	-- iterator returns the index before the value, but the value is most often more		-- iterator returns the index before the value, but the value is most often more
	-- important than the index.		-- important than the index.

			-- Any need for map that retains original keys, rather than creating an array?
	function p.map(func, ...)		function p.map(func, ...)
	checkType("map", 1, func, "function")		checkType("map", 1, func, "function")

	local array = {}		local array = {}
			local i = 0
	for ~~i_or_k~~, ~~val~~ in getIteratorTriplet("map", 2, ...) do		for val1, val2 in getIteratorTriplet("map", 2, ...) do
⚫	array[~~i_or_k~~] = func(~~val~~, ~~i_or_k, iterable~~)
			i = i + 1
		⚫	array[i] = func(val2, val1)
	end		end
	return array		return array
Line 123:		Line 127:
	end		end

	function p.forEach(func, ~~iterable~~)		function p.forEach(func, ...)
		⚫	checkType("forEach", 1, func, "function")
	local check = _check "forEach"
⚫	~~check~~(1, func, "function")
	check(2, iterable, iterableTypes)

			for val1, val2 in getIteratorTriplet("forEach", 2, ...) do
	local iterator = getIterator(iterable)
			func(val2, val1)
	for i_or_k, val in iterator(iterable) do
	func(val, i_or_k, iterable)
	end		end
	return nil		return nil
Line 182:		Line 183:
	-- some(function(val) return val % 2 == 0 end,		-- some(function(val) return val % 2 == 0 end,
	-- { 2, 3, 5, 7, 11 }) --> true		-- { 2, 3, 5, 7, 11 }) --> true
	function p.some(func, t)		function p.some(func, ...)
			checkType("some", 1, func, "function")
	if t[1] ~= nil then -- array

⚫	for i, v in ipairs(t) do
			for val1, val2 in getIteratorTriplet("some", 2, ...) do
⚫	if func(v, ~~i, t~~) then
			if func(val2, val1) then
⚫	return ~~true~~
	~~end~~		return true
	end
	else
	for k, v in pairs(t) do
⚫	if func(v, ~~k, t~~) then
	return true
	end
	end		end
	end		end

	return false		return false
	end		end
Line 202:		Line 198:
	-- { 2, 4, 8, 10, 12 }) --> true		-- { 2, 4, 8, 10, 12 }) --> true
	function p.all(func, t)		function p.all(func, t)
			checkType("some", 1, func, "function")
	if t[1] ~= nil then -- array

	for i, v in ipairs(t) do
		⚫	for val1, val2 in ipairs(t) do
	if not func(v, ~~i, t~~) then		if not func(val2, val1) then
	return false
		⚫	return false
	end
	end
	else
	for k, v in pairs(t) do
	if not func(v, k, t) then
	return false
	end
	end		end
	end		end

	return true		return true
	end		end

	function p.filter(func, ~~iterable~~)		function p.filter(func, ...)
	local check = _check ~~"filter"~~		local check = _check
	~~check~~(1, func, "function")		checkType("filter", 1, func, "function")
	check(2, iterable, iterableTypes)

	local new_t = {}		local new_t = {}
	local new_i = 0		local new_i = 0
		⚫	for v1, v2 in getIteratorTriplet(...) do
	local iterator = getIterator(iterable)
		⚫	if func(v2, v1) then
⚫	for v1, v2 in ~~iterator~~(~~iterable~~) do
	if func(v2, v1, t) then
	new_i = new_i + 1		new_i = new_i + 1
	new_t[new_i] = v		new_t[new_i] = v
Line 239:		Line 228:
	low = low - 1		low = low - 1
	return function ()		return function ()
	low ~~= low~~ + 1		if low < high then
	if low <= ~~high~~ ~~then~~		low = low + 1
	return low		return low
	end		end

Erutuon: fold(func, accum, ...) allows for more generality

2018-07-02T02:29:13Z

fold(func, accum, ...) allows for more generality

← Previous revision		Revision as of 02:29, 2 July 2018
Line 89:		Line 89:
	-- important than the index.		-- important than the index.
	function p.map(func, ...)		function p.map(func, ...)
	checkType('map', 1, func, "function")		checkType("map", 1, func, "function")

	local array = {}		local array = {}
	for i_or_k, val in getIteratorTriplet('map', 2, ...) do		for i_or_k, val in getIteratorTriplet("map", 2, ...) do
	array[i_or_k] = func(val, i_or_k, iterable)		array[i_or_k] = func(val, i_or_k, iterable)
	end		end
Line 100:		Line 100:
	p.mapIter = p.map		p.mapIter = p.map

	local function fold(func~~, iterable~~, result, ~~checked~~)		local function fold(func, result, ...)
		⚫	checkType("fold", 1, func, "function")
	if not checked then
			for val1, val2 in getIteratorTriplet('fold', 3, ...) do
	local check = _check 'fold'
		⚫	result = func(result, val2, val1)
	check(1, func, "function")
	check(2, iterable, iterableTypes)
	-- Result can be anything.
	end		end

	local iterator = getIterator(iterable)
	for i_or_k, val in iterator(iterable) do
⚫	result = func(result, ~~val~~, ~~i_or_k~~)
	end

	return result		return result
	end		end
	p.fold = fold		p.fold = fold

	function p.count(func, ~~iterable~~)		function p.count(func, ...)
		⚫	checkType("count", 1, func, "function")
	local check = _check 'count'
⚫	~~check~~(1, func, "function")
	check(2, iterable, iterableTypes)

	return fold(		return fold(
Line 129:		Line 119:
	return count		return count
	end,		end,
	iterable,
	0,		0,
	~~true~~)		...)
	end		end

	function p.forEach(func, iterable)		function p.forEach(func, iterable)
	local check = _check 'forEach'		local check = _check "forEach"
	check(1, func, "function")		check(1, func, "function")
	check(2, iterable, iterableTypes)		check(2, iterable, iterableTypes)
Line 154:		Line 143:
	-- reverse args by building a function to do it, similar to the unpack() example		-- reverse args by building a function to do it, similar to the unpack() example
	local function reverseHelper(acc, v, ...)		local function reverseHelper(acc, v, ...)
	if select('#', ...) == 0 then		if select("#", ...) == 0 then
	return v, acc()		return v, acc()
	else		else
Line 230:		Line 219:

	function p.filter(func, iterable)		function p.filter(func, iterable)
	local check = _check 'filter'		local check = _check "filter"
	check(1, func, "function")		check(1, func, "function")
	check(2, iterable, iterableTypes)		check(2, iterable, iterableTypes)

Erutuon: getIteratorTriplet to generalize map function; documentation

2018-07-02T01:32:34Z

getIteratorTriplet to generalize map function; documentation

@@ Line 15: / Line 15: @@
 		end
 	else
-		local checkFunc = _checkCache[funcName] -- Lua 5.1 doesn't cache functions as Lua 5.3 does.
+		-- Lua 5.1 doesn't cache functions as Lua 5.3 does.
 			or function(argIndex, arg, expectType, nilOk)
 				if type(expectType) == "table" then
@@ Line 49: / Line 50: @@
 		or iterable[1] ~= nil and ipairs
 		or pairs
 end
@@ Line 59: / Line 81: @@
 --	map(function (char) return string.char(string.byte(char) - 0x20) end,
 --		"abc")											--> { "A", "B", "C" }
 function p.map(func, ...)
 	local array = {}
 		array[i_or_k] = func(val, i_or_k, iterable)
 	end
@@ Line 78: / Line 98: @@
 end
-function p.mapIter(func, iter, iterable, initVal)
+p.mapIter = p.map
 local function fold(func, iterable, result, checked)

Erutuon: not a valid wikilink

2018-07-02T00:10:54Z

not a valid wikilink

← Previous revision		Revision as of 00:10, 2 July 2018
Line 142:		Line 142:

	-------------------------------------------------		-------------------------------------------------
	-- From [[http://lua-users.org/wiki/CurriedLua]].		-- From http://lua-users.org/wiki/CurriedLua.
	-- reverse(...) : take some tuple and return a tuple of elements in reverse order		-- reverse(...) : take some tuple and return a tuple of elements in reverse order
	--		--

Erutuon: allow map to accept iterator like mapIter (redirect it to mapIter if second argument is function)

2018-07-02T00:09:39Z

allow map to accept iterator like mapIter (redirect it to mapIter if second argument is function)

← Previous revision		Revision as of 00:09, 2 July 2018
Line 59:		Line 59:
	-- map(function (char) return string.char(string.byte(char) - 0x20) end,		-- map(function (char) return string.char(string.byte(char) - 0x20) end,
	-- "abc") --> { "A", "B", "C" }		-- "abc") --> { "A", "B", "C" }
	function p.map(func, ~~iterable~~)		function p.map(func, ...)
			-- If second parameter is function, redirect to mapIter.
			if type(...) == "function" then
			return p.mapIter(func, ...)
			end

			local iterable = ...
	local check = _check 'map'		local check = _check 'map'
	check(1, func, "function")		check(1, func, "function")