Module:ArgRest - Revision history

Lemondoge: enclose the pipe capture in a separate thingamajig

2023-05-11T14:20:21Z

enclose the pipe capture in a separate thingamajig

← Previous revision		Revision as of 14:20, 11 May 2023
Line 28:		Line 28:
	end		end

	local processed = wikitext:gsub("{{{([^{}<>\|]+)(\|?([^{}\|]*))}}}", function(a, b, c) return replaceTripleBraces(a, b, c, i) end) -- Find stuff of the form {{{parameter}}} or {{{parameter\|default}}} via pattern matching		local processed = wikitext:gsub("{{{([^{}<>\|]+)(\|?)([^{}\|]*)}}}", function(a, b, c) return replaceTripleBraces(a, b, c, i) end) -- Find stuff of the form {{{parameter}}} or {{{parameter\|default}}} via pattern matching
	result = result .. processed		result = result .. processed
	end		end

Lemondoge: using local p instead of global p

2023-04-13T22:11:13Z

using local p instead of global p

← Previous revision		Revision as of 22:11, 13 April 2023
Line 1:		Line 1:
	p = {}		local p = {}

	function p.main(frame)		function p.main(frame)

Lemondoge: using assert instead of "if not ... then"

2023-03-31T21:54:41Z

using assert instead of "if not ... then"

← Previous revision		Revision as of 21:54, 31 March 2023
Line 15:		Line 15:
	local result = ''		local result = ''

		⚫	assert(secondParam, "second parameter missing")
	if not secondParam then
⚫	~~error~~("second parameter missing")
	end

	local function replaceTripleBraces(parameter, _, default, i) -- extract corresponding arguments from the parent function. the _ is necessary because the pipe still gets caught in the second capture group		local function replaceTripleBraces(parameter, _, default, i) -- extract corresponding arguments from the parent function. the _ is necessary because the pipe still gets caught in the second capture group

Lemondoge: quick speed-fix for minor bug (although it is a very mildly gross solution

2023-03-31T21:37:11Z

quick speed-fix for minor bug (although it is a very mildly gross solution

← Previous revision		Revision as of 21:37, 31 March 2023
Line 20:		Line 20:

	local function replaceTripleBraces(parameter, _, default, i) -- extract corresponding arguments from the parent function. the _ is necessary because the pipe still gets caught in the second capture group		local function replaceTripleBraces(parameter, _, default, i) -- extract corresponding arguments from the parent function. the _ is necessary because the pipe still gets caught in the second capture group
	if ~~default~~ == "" then default = nil end		if _ == "" then default = nil end -- mildly ugly hack for checking for {{{parameter\|}}}
	return frame:getParent().args[parameter:gsub("%d+", tostring(i))] or default or "{{{" .. parameter .. "}}}"		return frame:getParent().args[parameter:gsub("%d+", tostring(i))] or default or "{{{" .. parameter .. "}}}"
	end		end

Lemondoge: Allowed the pattern matching to capture angle brackets in the default; although I can't support curly braces yet, angle brackets shouldn't cause any problems.

2023-03-31T20:41:49Z

Allowed the pattern matching to capture angle brackets in the default; although I can't support curly braces yet, angle brackets shouldn't cause any problems.

← Previous revision		Revision as of 20:41, 31 March 2023
Line 30:		Line 30:
	end		end

	local processed = wikitext:gsub("{{{([^{}<>\|]+)(\|?([^{}<>\|]*))}}}", function(a, b, c) return replaceTripleBraces(a, b, c, i) end) -- Find stuff of the form {{{parameter}}} or {{{parameter\|default}}} via pattern matching		local processed = wikitext:gsub("{{{([^{}<>\|]+)(\|?([^{}\|]*))}}}", function(a, b, c) return replaceTripleBraces(a, b, c, i) end) -- Find stuff of the form {{{parameter}}} or {{{parameter\|default}}} via pattern matching
	result = result .. processed		result = result .. processed
	end		end

Lemondoge: remove useless pair of parentheses

2023-03-31T20:14:27Z

remove useless pair of parentheses

← Previous revision		Revision as of 20:14, 31 March 2023
Line 12:		Line 12:

	local secondParam = frame.args[2]		local secondParam = frame.args[2]
	local start = tonumber(secondParam:match('(%d+)')) -- Extract the first number from the second parameter		local start = tonumber(secondParam:match('%d+')) -- Extract the first number from the second parameter
	local result = ''		local result = ''

Lemondoge: Porting from Sandbox

2023-03-30T21:14:12Z

Porting from Sandbox

← Previous revision		Revision as of 21:14, 30 March 2023
Line 2:		Line 2:

	function p.main(frame)		function p.main(frame)
			-- Undo sanitization:
	local code = frame.args[1] or ''		local code = frame.args[1] or ''
		⚫	if code:match'nowiki' then
⚫	local secondParam = frame.args[2]

⚫	if code:match'nowiki' then ~~-- undo nowiki sanitization~~
	code = mw.text.unstripNoWiki(code)		code = mw.text.unstripNoWiki(code)
	else ~~return~~ error("<nowiki> ~~tags~~ missing from first parameter") end		else error("<nowiki> missing from first parameter") end

			-- Angle brackets still remain santiized; unsanitize them
	if not secondParam then return error("second parameter missing") end -- Check for second parameter
		⚫	local wikitext = code:gsub('<', '<'):gsub('>', '>')

		⚫	local secondParam = frame.args[2]
⚫	local wikitext = ~~frame:preprocess(~~code):gsub("<", "<"):gsub(">", ">") ~~-- angle brackets are still sanitized; undo it~~
	local start = tonumber(secondParam:match('%d+')) -- Extract the first number from the second parameter		local start = tonumber(secondParam:match('(%d+)')) -- Extract the first number from the second parameter
	local result = ''		local result = ''

			if not secondParam then
			error("second parameter missing")
			end

	local function replaceTripleBraces(parameter, _, default, i) -- extract corresponding arguments from the parent function. the _ is necessary because the pipe still gets caught in the second capture group		local function replaceTripleBraces(parameter, _, default, i) -- extract corresponding arguments from the parent function. the _ is necessary because the pipe still gets caught in the second capture group
			if default == "" then default = nil end
	return frame:getParent().args[parameter:gsub("%d+", tostring(i))] or default or "{{{" .. parameter .. "}}}"		return frame:getParent().args[parameter:gsub("%d+", tostring(i))] or default or "{{{" .. parameter .. "}}}"
	end		end

	for i = start, math.huge do		for i = start, math.huge do
Line 29:		Line 34:
	end		end

	return result		return frame:preprocess(result)
	end		end

Lemondoge: doesn't look like the parentheses are necessary

2023-03-30T18:03:13Z

doesn't look like the parentheses are necessary

← Previous revision		Revision as of 18:03, 30 March 2023
Line 12:		Line 12:

	local wikitext = frame:preprocess(code):gsub("<", "<"):gsub(">", ">") -- angle brackets are still sanitized; undo it		local wikitext = frame:preprocess(code):gsub("<", "<"):gsub(">", ">") -- angle brackets are still sanitized; undo it
	local start = tonumber(secondParam:match('(%d+)')) -- Extract the first number from the second parameter		local start = tonumber(secondParam:match('%d+')) -- Extract the first number from the second parameter
	local result = ''		local result = ''

Lemondoge: Should now default to "{{{blah}}}" if the parameter wasn't given and had no default

2023-03-30T18:01:12Z

Should now default to "{{{blah}}}" if the parameter wasn't given and had no default

← Previous revision		Revision as of 18:01, 30 March 2023
Line 16:		Line 16:

	local function replaceTripleBraces(parameter, _, default, i) -- extract corresponding arguments from the parent function. the _ is necessary because the pipe still gets caught in the second capture group		local function replaceTripleBraces(parameter, _, default, i) -- extract corresponding arguments from the parent function. the _ is necessary because the pipe still gets caught in the second capture group
	return frame:getParent().args[parameter:gsub("%d+", tostring(i))] or default		return frame:getParent().args[parameter:gsub("%d+", tostring(i))] or default or "{{{" .. parameter .. "}}}"
	end		end

Lemondoge: Lemondoge moved page Module:Sandbox/Lemondoge to Module:ArgRest without leaving a redirect: Module is now a bit more mature, so I'm moving it out of Sandbox.

2023-03-29T22:20:11Z

Lemondoge moved page Module:Sandbox/Lemondoge to Module:ArgRest without leaving a redirect: Module is now a bit more mature, so I'm moving it out of Sandbox.

← Previous revision	Revision as of 22:20, 29 March 2023
(No difference)