Module:Arguments: Difference between revisions

Line 92:

found = true

end

-- We test for false specifically here so that nil (the default) acts like true.

if found or options.frameOnly == false then

Line 170:

-- into one table using the specified iterator. If a value is already

-- present it is not overwritten; tables listed earlier have precedence.

-- We are also memoizing nil values, ~~but those values~~ can be

-- We are also memoizing nil values, which can be overwritten if they

-- ~~overwritten~~.

-- are 's' (soft).

--]]

for _, t in ipairs(tables) do

for key, val in iterator(t) do

if metaArgs[key] == nil then

if metaArgs[key] == nil and nilArgs[key] ~= 'h' then

local tidiedVal = tidyVal(key, val)

if tidiedVal == nil then

nilArgs[key] = ~~true~~

nilArgs[key] = 's'

else

metaArgs[key] = tidiedVal

Line 219:

for _, argTable in ipairs(argTables) do

local argTableVal = tidyVal(key, argTable[key])

if argTableVal == nil then

if argTableVal ~= nil then

nilArgs[key] = ~~true~~

~~else~~

metaArgs[key] = argTableVal

return argTableVal

end

nilArgs[key] = 'h'

return nil

end

Line 255:

Line 254:

--]]

metaArgs[key] = nil

nilArgs[key] = ~~true~~

nilArgs[key] = 'h'

else

metaArgs[key] = val

@@ Line 92: / Line 92: @@
 					found = true
 				end
 				-- We test for false specifically here so that nil (the default) acts like true.
 				if found or options.frameOnly == false then
@@ Line 170: / Line 170: @@
 		-- into one table using the specified iterator. If a value is already
 		-- present it is not overwritten; tables listed earlier have precedence.
-		-- We are also memoizing nil values, but those values can be
+		-- We are also memoizing nil values, which can be overwritten if they
-		-- overwritten.
+		-- are 's' (soft).
 		--]]
 		for _, t in ipairs(tables) do
 			for key, val in iterator(t) do
-				if metaArgs[key] == nil then
+				if metaArgs[key] == nil and nilArgs[key] ~= 'h' then
 					local tidiedVal = tidyVal(key, val)
 					if tidiedVal == nil then
-						nilArgs[key] = true
+						nilArgs[key] = 's'
 					else
 						metaArgs[key] = tidiedVal
@@ Line 219: / Line 219: @@
 		for _, argTable in ipairs(argTables) do
 			local argTableVal = tidyVal(key, argTable[key])
-			if argTableVal == nil then
+			if argTableVal ~= nil then
-				nilArgs[key] = true
-			else
 				metaArgs[key] = argTableVal
 				return argTableVal
 			end
 		end
+		nilArgs[key] = 'h'
 		return nil
 	end
@@ Line 255: / Line 254: @@
 			--]]
 			metaArgs[key] = nil
-			nilArgs[key] = true
+			nilArgs[key] = 'h'
 		else
 			metaArgs[key] = val