Module:Xpsoc - Revision history

Mr. Stradivarius: use Module:Template invocation

2014-11-24T04:14:42Z

@@ Line 1: / Line 1: @@
 -- This module implements {{xpsoc}}.
 local p = {}
 function p._main(args, frame)
@@ Line 73: / Line 27: @@
 	end
-	local invocation = makeInvocation(name, invArgs, true)
+	local invocation = mTemplateInvocation.invocation(name, invArgs, 'nowiki')
 	local gives = args.gives or mw.language.getContentLanguage():getArrow('forwards')
-	local result = frame:preprocess(makeInvocation(name, invArgs))
+	local result = frame:preprocess(mTemplateInvocation.invocation(name, invArgs))
 	return string.format('<code>%s</code> %s %s', invocation, gives, result)

Mr. Stradivarius: use frame:preprocess so that this works with things like parser functions too

2014-10-29T05:34:01Z

use frame:preprocess so that this works with things like parser functions too

← Previous revision		Revision as of 05:34, 29 October 2014
Line 3:		Line 3:
	local p = {}		local p = {}

	local function makeInvocation(name, args)		local function makeInvocation(name, args, useNoWiki)
	-- This function makes a template invocation from the name and the arguments		-- This function makes a template invocation from the name and the arguments
	-- given.		-- given.
Line 13:		Line 13:
	for k, v in pairs(args) do		for k, v in pairs(args) do
	invArgs[k] = v		invArgs[k] = v
			end

			-- Get the separators to use.
			local seps = {
			openb = '{{',
			closeb = '}}',
			pipe = '\|'
			}
			if useNoWiki then
			for k, v in pairs(seps) do
		⚫	seps[k] = mw.text.nowiki(v)
			end
	end		end

	-- Build the invocation body with numbered args first, then named.		-- Build the invocation body with numbered args first, then named.
⚫	~~local pipe~~ = mw.text.nowiki(~~'\|'~~)
	local ret = {}		local ret = {}
	ret[#ret + 1] = mw.~~text.nowiki('{{')~~		ret[#ret + 1] = seps.openb
	ret[#ret + 1] = name		ret[#ret + 1] = name
	for k, v in ipairs(invArgs) do		for k, v in ipairs(invArgs) do
Line 25:		Line 36:
	break		break
	end		end
	ret[#ret + 1] = pipe		ret[#ret + 1] = seps.pipe
	ret[#ret + 1] = v		ret[#ret + 1] = v
	invArgs[k] = nil -- Erase the key so that we don't add the value twice		invArgs[k] = nil -- Erase the key so that we don't add the value twice
	end		end
	for k, v in pairs(invArgs) do		for k, v in pairs(invArgs) do
	ret[#ret + 1] = pipe		ret[#ret + 1] = seps.pipe
	ret[#ret + 1] = k		ret[#ret + 1] = k
	ret[#ret + 1] = '='		ret[#ret + 1] = '='
	ret[#ret + 1] = v		ret[#ret + 1] = v
	end		end
	ret[#ret + 1] = mw.~~text.nowiki('}}')~~		ret[#ret + 1] = seps.closeb

	return table.concat(ret)		return table.concat(ret)
Line 62:		Line 73:
	end		end

	local invocation = makeInvocation(name, invArgs)		local invocation = makeInvocation(name, invArgs, true)
	local gives = args.gives or mw.language.getContentLanguage():getArrow('forwards')		local gives = args.gives or mw.language.getContentLanguage():getArrow('forwards')
	local result = frame:~~expandTemplate{title =~~ name, ~~args =~~ invArgs}		local result = frame:preprocess(makeInvocation(name, invArgs))

	return string.format('<code>%s</code> %s %s', invocation, gives, result)		return string.format('<code>%s</code> %s %s', invocation, gives, result)

Mr. Stradivarius: get an arrow facing forwards for whatever content language we are using

2014-10-28T02:39:05Z

get an arrow facing forwards for whatever content language we are using

← Previous revision		Revision as of 02:39, 28 October 2014
Line 63:		Line 63:

	local invocation = makeInvocation(name, invArgs)		local invocation = makeInvocation(name, invArgs)
	local gives = args.gives or '→'		local gives = args.gives or mw.language.getContentLanguage():getArrow('forwards')
	local result = frame:expandTemplate{title = name, args = invArgs}		local result = frame:expandTemplate{title = name, args = invArgs}

Mr. Stradivarius: fix script error when k=1

2014-10-28T02:33:32Z

fix script error when k=1

← Previous revision		Revision as of 02:33, 28 October 2014
Line 50:		Line 50:
	local invArgs = {}		local invArgs = {}
	for k, v in pairs(args) do		for k, v in pairs(args) do
	if ~~type(k) == 'number' and~~ k ~= 1 then		if k ~= 1 then
	~~invArgs[~~k ~~- 1]~~ = v		if type(k) == 'number' then
			invArgs[k - 1] = v
	else		else
	local num = k:match('^n([1-9][0-9]*)$')		local num = k:match('^n([1-9][0-9]*)$')
	if num then
	invArgs[args[k]] = args['v' .. num]		if num then
			invArgs[args[k]] = args['v' .. num]
			end
	end		end
	end		end

Mr. Stradivarius: assigning args[1] as nil doesn't seem to work, so test for key "1" during the loop

2014-10-28T02:32:09Z

assigning args[1] as nil doesn't seem to work, so test for key "1" during the loop

← Previous revision		Revision as of 02:32, 28 October 2014
Line 48:		Line 48:
	error('no template name passed to xpsoc', 2)		error('no template name passed to xpsoc', 2)
	end		end
	args[1] = nil
	local invArgs = {}		local invArgs = {}
	for k, v in pairs(args) do		for k, v in pairs(args) do
	if type(k) == 'number' then		if type(k) == 'number' and k ~= 1 then
	invArgs[k - 1] = v		invArgs[k - 1] = v
	else		else

Mr. Stradivarius: raise an error if we don't get given a template name

2014-10-28T02:29:21Z

raise an error if we don't get given a template name

← Previous revision		Revision as of 02:29, 28 October 2014
Line 45:		Line 45:
	-- Get the invocation arguments.		-- Get the invocation arguments.
	local name = args[1]		local name = args[1]
			if not name then
			error('no template name passed to xpsoc', 2)
			end
	args[1] = nil		args[1] = nil
	local invArgs = {}		local invArgs = {}

Mr. Stradivarius: create replacement for Template:Xpsoc

2014-10-28T02:26:18Z

create replacement for Template:Xpsoc

New page

-- This module implements {{xpsoc}}.

local p = {}

local function makeInvocation(name, args)
-- This function makes a template invocation from the name and the arguments
-- given.

-- Copy the invocation args and convert magic words.
-- We need to make a copy of the table rather than just using the original,
-- as some of the values may be erased when building the invocation.
local invArgs = {}
for k, v in pairs(args) do
invArgs[k] = v
end

-- Build the invocation body with numbered args first, then named.
local pipe = mw.text.nowiki('|')
local ret = {}
ret[#ret + 1] = mw.text.nowiki('{{')
ret[#ret + 1] = name
for k, v in ipairs(invArgs) do
if v:find('=', 1, true) then
-- Likely something like 1=foo=bar, we need to do it as a named arg
break
end
ret[#ret + 1] = pipe
ret[#ret + 1] = v
invArgs[k] = nil -- Erase the key so that we don't add the value twice
end
for k, v in pairs(invArgs) do
ret[#ret + 1] = pipe
ret[#ret + 1] = k
ret[#ret + 1] = '='
ret[#ret + 1] = v
end
ret[#ret + 1] = mw.text.nowiki('}}')

return table.concat(ret)
end

function p._main(args, frame)
frame = frame or mw.getCurrentFrame()

-- Get the invocation arguments.
local name = args[1]
args[1] = nil
local invArgs = {}
for k, v in pairs(args) do
if type(k) == 'number' then
invArgs[k - 1] = v
else
local num = k:match('^n([1-9][0-9]*)$')
if num then
invArgs[args[k]] = args['v' .. num]
end
end
end

local invocation = makeInvocation(name, invArgs)
local gives = args.gives or '→'
local result = frame:expandTemplate{title = name, args = invArgs}

return string.format('<code>%s</code> %s %s', invocation, gives, result)
end

function p.main(frame)
return p._main(frame:getParent().args, frame)
end

return p