Module:Ustring: Difference between revisions

Module:Ustring (view source)

283 bytes added , 1 year ago

Replace Module:No globals with require( "strict" )

Anonymous user

@@ Line 1: / Line 1: @@
-require('Module:No globals')
+require('strict')
 return setmetatable({}, {
 	__index = function(t, k)
@@ Line 7: / Line 7: @@
 		end
 		return function(frame)
-			local args = frame.args
+			local fargs = frame.args
-			for _, v in ipairs(args) do
+			local fargsused = { tag = true }
-				args[_] = tonumber(v) or v:gsub("^\\", "", 1)
+			local args = {}
+			local str_i = 1
+			while fargs['s' .. str_i] do
+				fargsused['s' .. str_i] = true
+				args[str_i] = fargs['s' .. str_i]
+				str_i = str_i + 1
 			end
-			if not args.tag then
+			for i, v in ipairs(fargs) do
-				return (what(unpack(args)))
+				fargsused[i] = true
+				args[i + str_i - 1] = tonumber(v) or v:gsub("^\\", "", 1)
+			end
+			if not fargs.tag then
+				return (what(unpack(args)))		-- Outside parens truncate to first result avoiding tail call
 			end
 			local tagargs = {}
-			for x, y in pairs(args) do
+			for x, y in pairs(fargs) do
-				if type(x) ~= 'number' and x ~= 'tag' then tagargs[x] = y end
+				if not fargsused[x] then tagargs[x] = y end
 			end
-			return frame:extensionTag{name = args.tag, content = what(unpack(args)), args = tagargs}
+			return frame:extensionTag{name = fargs.tag, content = what(unpack(args)), args = tagargs}
 		end
 	end
 })