Module:ArgRest/sandbox - Revision history

Lemondoge: enclose pipe capturing in separate capture group

2023-05-11T14:22:14Z

enclose pipe capturing in separate capture group

← Previous revision		Revision as of 14:22, 11 May 2023
Line 19:		Line 19:
	-- Helper for replaceTripleBraces: reads through "default" to find aliases and the actual default		-- Helper for replaceTripleBraces: reads through "default" to find aliases and the actual default
	local function recurseOverBraces(str2, i)		local function recurseOverBraces(str2, i)
	local alias, _, default = str2:match("([^{}<>\|]+)(\|?(.*))")		local alias, _, default = str2:match("([^{}<>\|]+)(\|?)(.*)")
	if _ == "" then default = nil end		if _ == "" then default = nil end
	if default and default:match("{{%b{}}}") then		if default and default:match("{{%b{}}}") then
Line 29:		Line 29:
	local function replaceTripleBraces(str, i) -- extract corresponding arguments from the parent function.		local function replaceTripleBraces(str, i) -- extract corresponding arguments from the parent function.
	---- Since %b{} doesn't allow fine control, we must do a second search within the matched string		---- Since %b{} doesn't allow fine control, we must do a second search within the matched string
	local parameter, _, default = str:match("([^{}<>\|]+)(\|?(.*))")		local parameter, _, default = str:match("([^{}<>\|]+)(\|?)(.*)")

	if _ == "" then default = nil elseif default:match("{{%b{}}}") then		if _ == "" then default = nil elseif default:match("{{%b{}}}") then

Lemondoge: use local

2023-04-15T20:39:22Z

use local

← Previous revision		Revision as of 20:39, 15 April 2023
Line 1:		Line 1:
	p = {}		local p = {}

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

Lemondoge: it now works with aliases, save for the case where the first parameter has an alias. POG

2023-04-15T19:53:58Z

it now works with aliases, save for the case where the first parameter has an alias. POG

← Previous revision		Revision as of 19:53, 15 April 2023
Line 22:		Line 22:
	if _ == "" then default = nil end		if _ == "" then default = nil end
	if default and default:match("{{%b{}}}") then		if default and default:match("{{%b{}}}") then
	return frame:getParent().args[alias:gsub("%d+", tostring(i))] or recurseOverBraces(default:sub(-4, 4), i)		return frame:getParent().args[alias:gsub("%d+", tostring(i))] or recurseOverBraces(default:match("{{(%b{})}}"):sub(1, -2), i)
	else		else
	return frame:getParent().args[alias:gsub("%d+", tostring(i))] or default or "{{{" .. alias .. "}}}"		return frame:getParent().args[alias:gsub("%d+", tostring(i))] or default or "{{{" .. alias .. "}}}"
Line 32:		Line 32:

	if _ == "" then default = nil elseif default:match("{{%b{}}}") then		if _ == "" then default = nil elseif default:match("{{%b{}}}") then
	default = recurseOverBraces(default:match("{{(%b{})}}"):sub(1, -2~~, bool~~), i)		default = recurseOverBraces(default:match("{{(%b{})}}"):sub(1, -2), i)
	end		end

Lemondoge at 19:40, 15 April 2023

2023-04-15T19:40:31Z

← Previous revision		Revision as of 19:40, 15 April 2023
Line 38:		Line 38:
	end		end
	for i = start, math.huge do		for i = start, math.huge do
	-- Check if the parameter is defined		-- Check if the parameter is defined. TODO: make this check for aliases
	if not frame:getParent().args[secondParam:gsub('%d+', tostring(i))] then		if not frame:getParent().args[secondParam:gsub('%d+', tostring(i))] then
	break		break

Lemondoge: fixed error. Still incomplete, but I'm done with working on this sandbox variant for now

2023-04-01T21:13:51Z

fixed error. Still incomplete, but I'm done with working on this sandbox variant for now

← Previous revision		Revision as of 21:13, 1 April 2023
Line 32:		Line 32:

	if _ == "" then default = nil elseif default:match("{{%b{}}}") then		if _ == "" then default = nil elseif default:match("{{%b{}}}") then
	default = recurseOverBraces(default:sub(-4, 4), i)		default = recurseOverBraces(default:match("{{(%b{})}}"):sub(1, -2, bool), i)
	end		end

Lemondoge: perhaps, I done it

2023-04-01T20:56:36Z

perhaps, I done it

← Previous revision		Revision as of 20:56, 1 April 2023
Line 1:		Line 1:
	p = {}		p = {}

	-- undo sanitization

	function p.main(frame)		function p.main(frame)
Line 18:		Line 16:

	assert(secondParam, "second parameter missing")		assert(secondParam, "second parameter missing")
⚫
⚫	~~--[[~~
	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 .. "}}}"
	end
	]]--

	-- Helper for replaceTripleBraces: reads through "default" to find aliases and the actual default		-- Helper for replaceTripleBraces: reads through "default" to find aliases and the actual default
	local function recurseOverBraces(str2, i)		local function recurseOverBraces(str2, i)
	local alias, _, default = ~~str~~:match("([^{}<>\|]+)(\|?(.*))")		local alias, _, default = str2:match("([^{}<>\|]+)(\|?(.*))")
	if ~~default~~ == "" then default = nil end		if _ == "" then default = nil end
	if default.match("{{%b{}}}") then		if default and default:match("{{%b{}}}") then
	return frame:getParent().args[alias:gsub("%d+", tostring(i))] or recurseOverBraces(default:sub(-4, 4), i)		return frame:getParent().args[alias:gsub("%d+", tostring(i))] or recurseOverBraces(default:sub(-4, 4), i)
	else		else
Line 39:		Line 30:
	---- Since %b{} doesn't allow fine control, we must do a second search within the matched string		---- Since %b{} doesn't allow fine control, we must do a second search within the matched string
	local parameter, _, default = str:match("([^{}<>\|]+)(\|?(.*))")		local parameter, _, default = str:match("([^{}<>\|]+)(\|?(.*))")
		⚫
	if default == "" then default = nil elseif default.match("{{%b{}}}") then
		⚫	if _ == "" then default = nil elseif default:match("{{%b{}}}") then
	default = recurseOverBraces(default:sub(-4, 4), i)		default = recurseOverBraces(default:sub(-4, 4), i)
	end		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
Line 50:		Line 43:
	end		end
	-- local processed = wikitext:gsub("{{{([^{}<>\|]+)(\|?([^{}<>\|]*))}}}", function(a, b, c) return replaceTripleBraces(a, b, c, i) end)		-- local processed = wikitext:gsub("{{{([^{}<>\|]+)(\|?([^{}<>\|]*))}}}", function(a, b, c) return replaceTripleBraces(a, b, c, i) end)
	local processed = wikitext:gsub("{{%b{}}}", function(a) return replaceTripleBraces(a:sub(-4, 4), i) end) --matches everything in triple braces		local processed = wikitext:gsub("%{%{(%b{})%}%}", function(a) return replaceTripleBraces(a:sub(1, -2), i) end) --matches everything in triple braces
	result = result .. processed		result = result .. processed
	end		end

Lemondoge: (Hopefully) adding support for aliases and whatnot

2023-04-01T20:10:32Z

(Hopefully) adding support for aliases and whatnot

@@ Line 1: / Line 1: @@
 p = {}
 -- undo sanitization
@@ Line 21: / Line 17: @@
     local result = ''
     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 .. "}}}"
     end
     for i = start, math.huge do
         -- Check if the parameter is defined
@@ Line 35: / Line 49: @@
         	break
         end
-        local processed = wikitext:gsub("{{{([^{}<>|]+)(|?([^{}<>|]*))}}}", function(a, b, c) return replaceTripleBraces(a, b, c, i) end)
+        local processed = wikitext:gsub("{{%b{}}}", function(a) return replaceTripleBraces(a:sub(-4, 4), i) end)  --matches everything in triple braces
         result = result .. processed
     end

Lemondoge: removed useless pair of parentheses

2023-03-31T20:11:49Z

removed useless pair of parentheses

← Previous revision		Revision as of 20:11, 31 March 2023
Line 18:		Line 18:

	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: looks like it can just be preprocessed at the end; passes all of my testcases that way. Don't think it can be used to summon parameters, unfortunately

2023-03-30T21:12:06Z

looks like it can just be preprocessed at the end; passes all of my testcases that way. Don't think it can be used to summon parameters, unfortunately

← Previous revision		Revision as of 21:12, 30 March 2023
Line 14:		Line 14:
	else error("<nowiki> missing from first parameter") end		else error("<nowiki> missing from first parameter") end

			-- Angle brackets still remain santiized; unsanitize them
	-- Preprocess de-sanitized code. However, triple curly braces have to be temporarily re-sanitized because
		⚫	local wikitext = code:gsub('<', '<'):gsub('>', '>')
	-- Wikipedia tries to evaluate parameters at preprocessing, and WILL evaluate their defaults if they exist
⚫	local wikitext = ~~frame:preprocess(~~code:gsub('<', '<')
	:gsub('>', '>')
	:gsub("{{{", "}}}")
	:gsub("}}}", "{{{")
	):gsub("}", "{"):gsub("{", "}")

	local secondParam = frame.args[2]		local secondParam = frame.args[2]
Line 45:		Line 40:
	end		end

	return result		return frame:preprocess(result)
	end		end

Lemondoge: polish

2023-03-30T21:00:23Z

polish

@@ Line 4: / Line 4: @@
 --creates a frame object that cannot access any of the parent's args
 --unless a table containing a list keys of not to inherit is provided
 -- undo sanitization
-	local orphan = disinherit(frame)
+function p.main(frame)
 	local code = frame.args[1] or ''
 	if code:match'nowiki' then
@@ Line 19: / Line 14: @@
 	else error("<nowiki> missing from first parameter") end
-	-- Return de-sanitized code. However, triple curly braces have to be temporarily re-sanitized because
+	-- Preprocess de-sanitized code. However, triple curly braces have to be temporarily re-sanitized because
 	-- Wikipedia tries to evaluate parameters at preprocessing, and WILL evaluate their defaults if they exist
-	return frame:preprocess(code:gsub('&lt;', '<'):gsub('&gt;', '>'):gsub("{{{", "&rcub;&rcub;&rcub;"):gsub("}}}", "&lcub;&lcub;&lcub;"))
+	local wikitext = frame:preprocess(code:gsub('&lt;', '<')
 	local secondParam = frame.args[2]
     local start = tonumber(secondParam:match('(%d+)')) -- Extract the first number from the second parameter
@@ Line 53: / Line 49: @@
 return p