Module:Sandbox/BrandonXLF/Module:Map params - Revision history

BrandonXLF: This fallback chain is ok

2024-09-06T07:04:04Z

This fallback chain is ok

← Previous revision		Revision as of 07:04, 6 September 2024
Line 161:		Line 161:
	local result = {}		local result = {}
	local parent = frame:getParent()		local parent = frame:getParent()

	local sep

	if frame.args.call ~~then~~		local sep = frame.args.call and frame.args[1] or frame.args[2] or frame.args.sep or ''
	sep = frame.args[1] or frame.args.sep or ''
	else
	sep = frame.args[2] or frame.args.sep or ''
	end

	local conj = frame.args.conj or sep		local conj = frame.args.conj or sep
	local prefixes = getPrefixes(frame.args)		local prefixes = getPrefixes(frame.args)

2024-09-06T07:02:13Z

Use unnamed parameters for sep to support whitespace

← Previous revision		Revision as of 07:02, 6 September 2024
Line 162:		Line 162:
	local parent = frame:getParent()		local parent = frame:getParent()

	local sep ~~= frame.args.sep or ''~~		local sep

			if frame.args.call then
			sep = frame.args[1] or frame.args.sep or ''
			else
			sep = frame.args[2] or frame.args.sep or ''
			end

	local conj = frame.args.conj or sep		local conj = frame.args.conj or sep
	local prefixes = getPrefixes(frame.args)		local prefixes = getPrefixes(frame.args)

2024-09-05T17:43:50Z

Make a frame for preprocessing with any args

← Previous revision		Revision as of 17:43, 5 September 2024
Line 76:		Line 76:

	if expand then		if expand then
			local processingFrame = parent:newChild{
			title = 'Module:Map params preprocessor',
			args = {}
			}

	return function(num, args)		return function(num, args)
	return ~~parent~~:preprocess(substParams(code, num, args))		return processingFrame:preprocess(substParams(code, num, args))
	end		end
	end		end

2024-09-05T17:14:32Z

Use 1 instead of @

← Previous revision		Revision as of 17:14, 5 September 2024
Line 180:		Line 180:
	-- Pass current parameters without their numeric suffix		-- Pass current parameters without their numeric suffix
	for _, prefix in ipairs(prefixes) do		for _, prefix in ipairs(prefixes) do
	args[prefix ~= '' and prefix or '@'] = getPrefixedArg(parent.args, prefix, num, optNum)		args[prefix ~= '' and prefix or '1'] = getPrefixedArg(parent.args, prefix, num, optNum)
	end		end

2024-09-05T07:20:32Z

Avoid current frame args when preprocessing

← Previous revision		Revision as of 07:20, 5 September 2024
Line 57:		Line 57:

	-- Return the function that processes each iteration		-- Return the function that processes each iteration
	function makeProcessor(frame)		function makeProcessor(frame, parent)
	local template = frame.args.call		local template = frame.args.call

Line 77:		Line 77:
	if expand then		if expand then
	return function(num, args)		return function(num, args)
	return ~~frame~~:preprocess(substParams(code, num, args))		return parent:preprocess(substParams(code, num, args))
	end		end
	end		end
Line 161:		Line 161:
	local prefixes = getPrefixes(frame.args)		local prefixes = getPrefixes(frame.args)
	local extras = getExtras(frame.args)		local extras = getExtras(frame.args)
	local process = makeProcessor(frame)		local process = makeProcessor(frame, parent)
	local optNum = yesno(frame.args.optnum or true)		local optNum = yesno(frame.args.optnum or true)

2024-09-05T07:18:37Z

Not used

← Previous revision		Revision as of 07:18, 5 September 2024
Line 166:		Line 166:
	for _, num in numPairs(frame.args, parent.args, prefixes, optNum) do		for _, num in numPairs(frame.args, parent.args, prefixes, optNum) do
	local args = {}		local args = {}

	-- Inherent arguments passed to the template
	for k, v in pairs(parent.args) do
	args[k] = v
	end

	-- Pass extra registered arguments		-- Pass extra registered arguments

2024-09-05T06:35:06Z

{{I}} --> {{{i}}}

← Previous revision		Revision as of 06:35, 5 September 2024
Line 51:		Line 51:
	-- Perform wikitext parameter substitution		-- Perform wikitext parameter substitution
	function substParams(code, num, args)		function substParams(code, num, args)
			args['i'] = num
	local processed = code
	:gsub("{{[iI]}}", ~~num~~) -- ~~Custom~~ ~~magic word {{I}}~~		local processed = code:gsub("{{{([^{}\|])\|?[^{}]}}}", args) -- Substitute parameters
	:gsub("{{{([^{}\|])\|?[^{}]}}}", args) -- Substitute parameters
⚫
	return processed		return processed
	end		end
Line 64:		Line 62:
	if template then		if template then
	return function(num, args)		return function(num, args)
			args['i'] = num
		⚫
	return frame:expandTemplate{		return frame:expandTemplate{
	title = template,		title = template,

2024-09-04T22:06:47Z

Support extra

@@ Line 7: / Line 7: @@
 end
--- Get the prefixes to process
+-- Get the value of a prefixed argument
 local function getPrefixes(args)
 	local prefixes = {}
     local i = 1
     repeat
-    	table.insert(prefixes, args['prefix' .. i] or '')
+    	table.insert(prefixes, cur or '')
     	i = i + 1
-    until not args['prefix' .. i]
+    	cur = getPrefixedArg(args, 'prefix', i, true)
     return prefixes
 end
@@ Line 55: / Line 84: @@
 		return substParams(code, num, args)
 	end
 end
@@ Line 135: / Line 160: @@
 	local conj = frame.args.conj or sep
 	local prefixes = getPrefixes(frame.args)
 	local process = makeProcessor(frame)
 	local optNum = yesno(frame.args.optnum or true)
@@ Line 144: / Line 170: @@
 		for k, v in pairs(parent.args) do
 			args[k] = v
 		end

2024-09-04T06:54:11Z

← Previous revision		Revision as of 06:54, 4 September 2024
Line 61:		Line 61:
	end		end

	function numPairs(args, parentArgs, prefixes)		function numPairs(args, parentArgs, prefixes, optNum)
	local start = tonumber(args.start or 1)		local start = tonumber(args.start or 1)

Line 74:		Line 74:
	-- Check every prefix for a match		-- Check every prefix for a match
	while prefixes[j] and not prefixMatch do		while prefixes[j] and not prefixMatch do
	local numStr = tostring(k):match('^' .. escPattern(prefixes[j]) .. '(~~[1-9]~~%d*)$')		local numStr = tostring(k):match('^' .. escPattern(prefixes[j]) .. '(%d*)$')

	if numStr then		if numStr ~= nil then
	local num = tonumber(numStr) or (optNum and 1 or nil)		local num = tonumber(numStr) or (optNum and 1 or nil)

Line 83:		Line 83:
	seenNums[num] = true		seenNums[num] = true
	end		end

	end

	if numStr ~= nil then
	prefixMatch = true		prefixMatch = true
	end		end

2024-09-04T06:23:34Z

args

← Previous revision		Revision as of 06:23, 4 September 2024
Line 58:		Line 58:

	function getPrefixedArg(args, prefix, num, optNum)		function getPrefixedArg(args, prefix, num, optNum)
	return args[prefix .. num] or ((num == 1 and optNum and a[prefix]) or nil)		return args[prefix .. num] or ((num == 1 and optNum and args[prefix]) or nil)
	end		end