Module:LuaCall: Difference between revisions

Line 2:

function p.main(frame)

local parent=frame.getParent(frame) or {}

local parent = frame.getParent(frame) or {}

local reserved_value={}

local reserved_value = {}

local reserved_function,reserved_contents

local reserved_function, reserved_contents

for k,v in pairs(parent.args or {}) do

for k, v in pairs(parent.args or {}) do

_G[k]=tonumber(v) or v -- transfer every parameter directly to the global variable table

_G[k] = tonumber(v) or v -- transfer every parameter directly to the global variable table

end

for k,v in pairs(frame.args or {}) do

for k, v in pairs(frame.args or {}) do

_G[k]=tonumber(v) or v -- transfer every parameter directly to the global variable table

_G[k] = tonumber(v) or v -- transfer every parameter directly to the global variable table

end

--- Alas Scribunto does NOT implement coroutines, according to

Line 15:

--- this will not stop us from trying to implement one single lousy function call

if _G[1] then

reserved_function,reserved_contents=mw.ustring.match(_G[1],"^%s*(%a[^%s%(]*)%(([^%)]*)%)%s*$")

reserved_function, reserved_contents = mw.ustring.match(_G[1], "^%s*(%a[^%s%(]*)%(([^%)]*)%)%s*$")

end

if reserved_contents then

local reserved_counter=0

local reserved_counter = 0

repeat

reserved_counter=reserved_counter+1

reserved_counter = reserved_counter + 1

reserved_value[reserved_counter]=_G[mw.ustring.match(reserved_contents,"([^%,]+)")]

reserved_value[reserved_counter] = _G[mw.ustring.match(reserved_contents, "([^%,]+)")]

reserved_contents=mw.ustring.match(reserved_contents,"[^%,]+,(.*)$")

reserved_contents = mw.ustring.match(reserved_contents, "[^%,]+,(.*)$")

until not reserved_contents

end

local reserved_arraypart=_G

local reserved_arraypart = _G

while mw.ustring.match(reserved_function,"%.") do

while mw.ustring.match(reserved_function, "%.") do

reserved_functionpart,reserved_function=mw.ustring.match(reserved_function,"^(%a[^%.]*)%.(.*)$")

reserved_functionpart, reserved_function = mw.ustring.match(reserved_function, "^(%a[^%.]*)%.(.*)$")

reserved_arraypart=reserved_arraypart[reserved_functionpart]

reserved_arraypart = reserved_arraypart[reserved_functionpart]

end

local reserved_call=reserved_arraypart[reserved_function]

local reserved_call = reserved_arraypart[reserved_function]

if type(reserved_call)~="function" then

if type(reserved_call) ~= "function" then

return tostring(reserved_call)

else reserved_output={reserved_call(unpack(reserved_value))}

else

reserved_output = {reserved_call(unpack(reserved_value))}

return reserved_output[reserved_return or 1]

end

Line 144:

Line 145:

--]]

function p.invoke(frame)

local ~~func~~

local pframe, usedpargs = frame:getParent(), {}

~~local offset~~

-- get module and function names from parent args if not provided

if frame.args[1] ~= ~~nil~~ then

local pfargs = setmetatable({frame.args[1], frame.args[2]}, {__index = table})

~~local m~~ = ~~require('Module:' .. frame~~.args[1])

if not pfargs[1] then

if ~~frame.args~~[2] ~~~= nil~~ then

pfargs[1], usedpargs[1] = pframe.args[1], true

~~func~~ = ~~m[frame~~.args[2]]

if not pfargs[2] then

~~frame~~.args ~~= frame:getParent~~().args

pfargs[2], usedpargs[2] = pframe.args[2], true

~~offset = 0~~

end

~~else~~

elseif not pfargs[2] then

~~frame.args = frame~~:~~getParent~~()~~.args~~

pfargs[2], usedpargs[1] = pframe.args[1], true

~~func = m~~[~~frame.args[1]~~]

end

~~offset~~ = 1

-- repack sequential args

for i, v in ipairs(pframe.args) do

if not usedpargs[i] then

pfargs:insert(v)

usedpargs[i] = true

end

~~else~~

~~frame.args = frame:getParent().args~~

~~func = require('Module:' .. frame.args[1])[frame.args[2]]~~

~~offset = 2~~

end

~~local~~ args ~~= {}~~

-- copy other args

for _, v in ~~ipairsAtOffset~~(~~frame~~.args~~, offset~~) do

for k, v in pairs(pframe.args) do

~~table.insert(args~~, v)

if not pfargs[k] and not usedpargs[k] then

pfargs[k], usedpargs[k] = v, true

end

frame~~.args = args~~

-- #invoke off parent frame so the new frame has the same parent

return ~~func(frame)~~

return pframe:callParserFunction{name = '#invoke', args = pfargs}

end

return p

@@ Line 2: / Line 2: @@
 function p.main(frame)
-     local parent=frame.getParent(frame) or {}
+     local parent = frame.getParent(frame) or {}
-     local reserved_value={}
+     local reserved_value = {}
-     local reserved_function,reserved_contents
+     local reserved_function, reserved_contents
-     for k,v in pairs(parent.args or {}) do
+     for k, v in pairs(parent.args or {}) do
-         _G[k]=tonumber(v) or v -- transfer every parameter directly to the global variable table
+         _G[k] = tonumber(v) or v -- transfer every parameter directly to the global variable table
      end
-     for k,v in pairs(frame.args or {}) do
+     for k, v in pairs(frame.args or {}) do
-         _G[k]=tonumber(v) or v -- transfer every parameter directly to the global variable table
+         _G[k] = tonumber(v) or v -- transfer every parameter directly to the global variable table
      end
       --- Alas Scribunto does NOT implement coroutines, according to
@@ Line 15: / Line 15: @@
       --- this will not stop us from trying to implement one single lousy function call
      if _G[1] then
-         reserved_function,reserved_contents=mw.ustring.match(_G[1],"^%s*(%a[^%s%(]*)%(([^%)]*)%)%s*$")
+         reserved_function, reserved_contents = mw.ustring.match(_G[1], "^%s*(%a[^%s%(]*)%(([^%)]*)%)%s*$")
      end
      if reserved_contents then
-         local reserved_counter=0
+         local reserved_counter = 0
          repeat
-             reserved_counter=reserved_counter+1
+             reserved_counter = reserved_counter + 1
-             reserved_value[reserved_counter]=_G[mw.ustring.match(reserved_contents,"([^%,]+)")]
+             reserved_value[reserved_counter] = _G[mw.ustring.match(reserved_contents, "([^%,]+)")]
-             reserved_contents=mw.ustring.match(reserved_contents,"[^%,]+,(.*)$")
+             reserved_contents = mw.ustring.match(reserved_contents, "[^%,]+,(.*)$")
          until not reserved_contents
      end
-     local reserved_arraypart=_G
+     local reserved_arraypart = _G
-     while mw.ustring.match(reserved_function,"%.") do
+     while mw.ustring.match(reserved_function, "%.") do
-         reserved_functionpart,reserved_function=mw.ustring.match(reserved_function,"^(%a[^%.]*)%.(.*)$")
+         reserved_functionpart, reserved_function = mw.ustring.match(reserved_function, "^(%a[^%.]*)%.(.*)$")
-         reserved_arraypart=reserved_arraypart[reserved_functionpart]
+         reserved_arraypart = reserved_arraypart[reserved_functionpart]
      end
-     local reserved_call=reserved_arraypart[reserved_function]
+     local reserved_call = reserved_arraypart[reserved_function]
-     if type(reserved_call)~="function" then
+     if type(reserved_call) ~= "function" then
          return tostring(reserved_call)
-     else reserved_output={reserved_call(unpack(reserved_value))}
+     else
+    	reserved_output = {reserved_call(unpack(reserved_value))}
          return reserved_output[reserved_return or 1]
      end
@@ Line 144: / Line 145: @@
 --]]
 function p.invoke(frame)
-	local func
+	local pframe, usedpargs = frame:getParent(), {}
-	local offset
+	-- get module and function names from parent args if not provided
-	if frame.args[1] ~= nil then
+	local pfargs = setmetatable({frame.args[1], frame.args[2]}, {__index = table})
-		local m = require('Module:' .. frame.args[1])
+	if not pfargs[1] then
-		if frame.args[2] ~= nil then
+		pfargs[1], usedpargs[1] = pframe.args[1], true
-			func = m[frame.args[2]]
+		if not pfargs[2] then
-			frame.args = frame:getParent().args
+			pfargs[2], usedpargs[2] = pframe.args[2], true
-			offset = 0
+		end
-		else
+	elseif not pfargs[2] then
-			frame.args = frame:getParent().args
+		pfargs[2], usedpargs[1] = pframe.args[1], true
-			func = m[frame.args[1]]
+	end
-			offset = 1
+	-- repack sequential args
+	for i, v in ipairs(pframe.args) do
+		if not usedpargs[i] then
+			pfargs:insert(v)
+			usedpargs[i] = true
 		end
-	else
-		frame.args = frame:getParent().args
-		func = require('Module:' .. frame.args[1])[frame.args[2]]
-		offset = 2
 	end
-	local args = {}
+	-- copy other args
-	for _, v in ipairsAtOffset(frame.args, offset) do
+	for k, v in pairs(pframe.args) do
-		table.insert(args, v)
+		if not pfargs[k] and not usedpargs[k] then
+			pfargs[k], usedpargs[k] = v, true
+		end
 	end
-	frame.args = args
+	-- #invoke off parent frame so the new frame has the same parent
-	return func(frame)
+	return pframe:callParserFunction{name = '#invoke', args = pfargs}
 end
 return p