Fixed some special characters in URLs getting double-percent-encoded on standard redirection pages.

Updated some function argument checking.
Moved things around.

Author: ReFreezed

build/meta.lua

@@ -9,6 +9,7 @@
 --=
 --==============================================================
 
+	ARGS
 	convertTextFileEncoding, addBomToUft16File
 	copyFile, copyFilesInDirectory, copyDirectoryRecursive
 	execute, executeRequired
@@ -380,4 +381,52 @@ function XPCALL(lua)
 end
 
 
+do
+	local function outputArgumentChecks(errLevel, argsStr)
+		local optionalPos = argsStr:find("?", 1, true) or #argsStr
+		local n           = 1
+
+		for pos, argNames, types in argsStr:gmatch"()([%w_,]+):([%w_,*]+)" do
+			if types == "*" then
+				n = n + #argNames:gsub("[^,]+", "") + 1
+
+			else
+				if pos > optionalPos then  types = types..",nil"  end
+
+				local multipleTypes = types:find(",", 1, true) ~= nil
+				local ifFormat      = multipleTypes and "not isAny(type(%s), %s)" or 'type(%s) ~= "%s"'
+				local typesCode     = multipleTypes and types:gsub("[%w_]+", '"%0"') or types
+				local typesText     = multipleTypes and types:gsub(",",      " or ") or types
+
+				for argName in argNames:gmatch"[%w_]+" do
+					__LUA(F(
+						"if %s then  errorf(%d, \"Bad argument #%d '%s'. (Expected %s, got %%s)\", type(%s))  end\n",
+						ifFormat:format(argName, typesCode),
+						errLevel + 1,
+						n,
+						argName,
+						typesText,
+						argName
+					))
+					n = n + 1
+				end
+			end
+		end
+	end
+
+	-- ARGS [ (errorLevel=1) ] "arg1:arg1Type1,arg1Type2 arg2,arg3:arg2And3Type ? optionalArg4:optionalArg4Type ..."
+	function _G.ARGS(errLevelOrArgsStr)
+		if type(errLevelOrArgsStr) == "string" then
+			local argsStr = errLevelOrArgsStr
+			outputArgumentChecks(1, argsStr)
+		else
+			local errLevel = errLevelOrArgsStr
+			return function(argsStr)
+				outputArgumentChecks(errLevel, argsStr)
+			end
+		end
+	end
+end
+
+
 

src/app.lua2p

@@ -605,7 +605,7 @@ _G.scriptEnvironmentGlobals = {
 	end,
 
 	toDatetime = function(time)
-		assertArg(1, time, "number")
+		!ARGS "time:number"
 		return getDatetime(time)
 	end,
 
@@ -688,13 +688,13 @@ _G.scriptEnvironmentGlobals = {
 
 	echof = function(s, ...)
 		assertContext("template", "echof")
-		assertArg(1, s, "string")
+		!ARGS "s:string"
 		scriptEnvironmentGlobals.echo(s:format(...))
 	end,
 
 	echofRaw = function(s, ...)
 		assertContext("template", "echofRaw")
-		assertArg(1, s, "string")
+		!ARGS "s:string"
 		scriptEnvironmentGlobals.echoRaw(s:format(...))
 	end,
 
@@ -716,9 +716,7 @@ _G.scriptEnvironmentGlobals = {
 
 	generateFromTemplate = function(sitePathRel, template, paramsOrInit)
 		assertContext("config", "generateFromTemplate")
-		assertArg(1, sitePathRel,  "string")
-		assertArg(2, template,     "string")
-		assertArg(3, paramsOrInit, "table","function","nil")
+		!ARGS "sitePathRel,template:string ? paramsOrInit:table,function"
 
 		local pathRel = sitePathToPath(sitePathRel)
 		local page    = newPage(pathRel, false)
@@ -739,7 +737,7 @@ _G.scriptEnvironmentGlobals = {
 
 	outputRaw = function(sitePathRel, contents)
 		assertContext("config", "outputRaw")
-		assertArg(2, contents, "string")
+		!ARGS "sitePathRel,contents:string"
 
 		local pathRel = sitePathToPath(sitePathRel)
 		writeOutputFile("raw", pathRel, sitePathRel, contents, nil, "")

src/functions.lua2p

@@ -10,7 +10,7 @@
 --=
 --==============================================================
 
-	assert, assertArg
+	assert
 	attributeWith, attributeWithAny
 	cleanupPath
 	countStrings, countSubStrings
@@ -1465,8 +1465,7 @@ end
 
 
 function _G.getProtectionWrapper(obj, objName)
-	assertArg(1, obj,     "table")
-	assertArg(2, objName, "string")
+	!ARGS "obj:table objName:string"
 
 	local wrapper = protectionWrappers[obj]
 	if wrapper then  return wrapper  end
@@ -1630,8 +1629,7 @@ function _G.generateFromTemplateFile(page)
 end
 
 function _G.generateRedirection(url, targetUrl, sourcePath)
-	assertArg(1, url,       "string")
-	assertArg(2, targetUrl, "string")
+	!ARGS "url,targetUrl,sourcePath:string"
 
 	if not url:find"^/" then
 		errorLine("Redirection URLs must begin with '/'. (%s)", url)
@@ -1699,8 +1697,8 @@ function _G.generateRedirection(url, targetUrl, sourcePath)
 					</body>
 				</html>
 			]=], {
-				url           = encodeHtmlEntities(              toUrlAbsolute(targetUrl) ),
-				urlAbsPercent = encodeHtmlEntities(toUrlAbsolute(toUrlAbsolute(targetUrl))),
+				url           = encodeHtmlEntities(              targetUrl ),
+				urlAbsPercent = encodeHtmlEntities(toUrlAbsolute(targetUrl)),
 			}
 		)
 
@@ -1722,39 +1720,6 @@ function _G.assert(v, ...)
 	_error(message, 2)
 end
 
--- value = assertArg( [ functionName=auto, ] argumentNumber, value, expectedValueType1, ... [, depth=2 ] )
-do
-	local function _assertArg(fName, n, v, ...)
-		local vType       = type(v)
-		local varargCount = select("#", ...)
-		local lastArg     = select(varargCount, ...)
-		local hasDepthArg = (type(lastArg) == "number")
-		local typeCount   = varargCount+(hasDepthArg and -1 or 0)
-
-		for i = 1, typeCount do
-			if vType == select(i, ...) then  return v  end
-		end
-
-		local depth = 2 + (hasDepthArg and lastArg or 2)
-
-		if not fName then
-			fName = debug.traceback("", depth-1):match": in function '(.-)'" or "?"
-		end
-
-		local expects = table.concat({...}, " or ", 1, typeCount)
-
-		errorf(depth, "bad argument #%d to '%s' (%s expected, got %s)", n, fName, expects, vType)
-	end
-
-	function _G.assertArg(fNameOrArgNum, ...)
-		if type(fNameOrArgNum) == "string" then
-			return (_assertArg(fNameOrArgNum, ...))
-		else
-			return (_assertArg(nil, fNameOrArgNum, ...))
-		end
-	end
-end
-
 
 
 function _G.indexOf(t, v)
@@ -1846,7 +1811,7 @@ end
 
 
 function _G.datetimeToTime(datetime)
-	assertArg(1, datetime, "string")
+	!ARGS "datetime:string"
 
 	local date = dateLib(datetime)
 	local time = (date-dateLib.epoch()):spanseconds()
@@ -1856,7 +1821,7 @@ end
 
 -- datetime = getDatetime( [ time=now ] )
 function _G.getDatetime(time)
-	assertArg(1, time, "number","nil")
+	!ARGS "? time:number"
 
 	local date     = dateLib(time or os.time()):tolocal()
 	local datetime = date:fmt"${iso}%z" :gsub("..$", ":%0") :gsub("%+00:00$", "Z")
@@ -2056,8 +2021,7 @@ do
 	end
 
 	function _G.newPage(pathRel, isRedirection)
-		assertArg(1, pathRel,       "string")
-		assertArg(2, isRedirection, "boolean")
+		!ARGS "pathRel:string isRedirection:boolean"
 
 		local filename = getFilename(pathRel)
 		local ext      = getExtension(filename)
@@ -2145,7 +2109,7 @@ do
 				g = function(field)  return field.v ~= "" and field.v or page.date.v  end,
 				s = function(field, datetime)
 					assertContext("template", "publishDate", 3)
-					assertArg(1, datetime, "string")
+					!ARGS "datetime:string"
 					field.v = datetime
 				end,
 			},
@@ -2443,8 +2407,7 @@ do
 	end
 
 	function _G.makeError(message, level)
-		assertArg(1, message, "string")
-		assertArg(2, level,   "number","nil")
+		!ARGS "message:string ? level:number"
 
 		level       = (level == 0) and 0 or (level or 1)
 		local stack = {}
@@ -2523,7 +2486,7 @@ end
 
 
 function _G.ipairsr(t)
-	assertArg(1, t, "table")
+	!ARGS "t:table"
 	return iprev, t, #t+1
 end