Added aliases for some number formats. Added tests for preprocessor keywords.

Author: ReFreezed

misc/quickTest.lua2p

@@ -101,12 +101,16 @@ for _, token in ipairs{
 	newToken("keyword",     "while"),
 	-- newToken("keyword",     "continue"), -- Error! :'(
 	newToken("number",      42),
-	newToken("number",      42,   "integer"),
+	newToken("number",      44,   "integer"),
+	newToken("number",      48,   "int"),
 	newToken("number",      5.7,  "float"),
 	newToken("number",      0,    "float"),
 	newToken("number",      5.7,  "scientific"),
-	newToken("number",      .031, "scientific"),
+	newToken("number",      .031, "SCIENTIFIC"),
+	newToken("number",      5.7,  "e"),
+	newToken("number",      .031, "E"),
 	newToken("number",      42,   "hexadecimal"),
+	newToken("number",      42,   "HEX"),
 	newToken("number",      5.7,  "auto"),
 	newToken("number",      math.huge),
 	newToken("number",      -math.huge),

misc/runTests.lua

@@ -195,8 +195,25 @@ doTest("Output values of different types", function()
 	assert(not luaOut)
 end)
 
--- @Incomplete: Add tests for @insert and the other pp keywords.
--- @Incomplete: Add test for params.onInsert().
+doTest("Preprocessor keywords", function()
+	local pp = assert(loadfile"preprocess.lua")()
+
+	local luaOut = assert(pp.processString{ code=[[ filename = @file ]]})
+	assertCodeOutput(luaOut, [[filename = "<code>"]]) -- Note: The dummy value when we have no real path may change in the future.
+
+	local luaOut = assert(pp.processString{ code=[[ ln = @line ]]})
+	assertCodeOutput(luaOut, [[ln = 1]])
+
+	local luaOut = assert(pp.processString{
+		code = [[
+			v = @insert "foo"
+		]],
+		onInsert = function(name)
+			return '"bar"'
+		end,
+	})
+	assertCodeOutput(luaOut, [[v = "bar"]])
+end)
 
 
 
@@ -208,7 +225,7 @@ doTest("Get useful tokens", function()
 
 	pp.removeUselessTokens(tokens)
 
-	assert(#tokens == 4, "Unexpected amount of tokens.")
+	assert(#tokens == 4, "Unexpected token count.")
 	assert(tokens[1].type  == "keyword",     "Unexpected token type 1.")
 	assert(tokens[1].value == "local",       "Unexpected token value 1.")
 	assert(tokens[2].type  == "identifier",  "Unexpected token type 2.")

preprocess-cl.lua

@@ -130,7 +130,7 @@ exec lua "$0" "$@"
 			info: Info about the processed file. (See 'ProcessInfo' in preprocess.lua)
 
 	"fileerror"
-		Sent if an error happens while processing a file (right before the program quits).
+		Sent if an error happens while processing a file (right before the program exits).
 		Arguments:
 			path: The file being processed.
 			error: The error message.

preprocess.lua

@@ -122,7 +122,7 @@ setmetatable(_G, {__newindex=function(_G, k, v)
 end})
 --]]
 
-local VERSION = "1.11.2"
+local VERSION = "1.12.0"
 
 local MAX_DUPLICATE_FILE_INSERTS = 1000 -- @Incomplete: Make this a parameter for processFile()/processString().
 
@@ -252,7 +252,7 @@ function printTraceback(message, level)
 	print(message)
 	print("stack traceback:")
 
-	for level = 1+(level or 1), math.huge do
+	for level = 1+(level or 1), 1/0 do
 		local info = debug.getinfo(level, "nSl")
 		if not info then  break  end
 
@@ -799,9 +799,9 @@ function serialize(buffer, v)
 
 		table.insert(buffer, '"'..s..'"')
 
-	elseif v == math.huge then
+	elseif v == 1/0 then
 		table.insert(buffer, "(1/0)")
-	elseif v == -math.huge then
+	elseif v == -1/0 then
 		table.insert(buffer, "(-1/0)")
 	elseif v ~= v then
 		table.insert(buffer, "(0/0)") -- NaN.
@@ -956,8 +956,8 @@ function getNextUsableToken(tokens, i, iLimit, dir)
 
 	iLimit
 		=   dir < 0
-		and math.max((iLimit or 1), 1)
-		or  math.min((iLimit or math.huge), #tokens)
+		and math.max((iLimit or 1  ), 1)
+		or  math.min((iLimit or 1/0), #tokens)
 
 	for i = i, iLimit, dir do
 		if not USELESS_TOKENS[tokens[i].type] then
@@ -1275,11 +1275,16 @@ end
 --
 -- Number formats:
 --   "integer"      E.g. 42
+--   "int"          Same as integer, e.g. 42
 --   "float"        E.g. 3.14
 --   "scientific"   E.g. 0.7e+12
 --   "SCIENTIFIC"   E.g. 0.7E+12 (upper case)
+--   "e"            Same as scientific, e.g. 0.7e+12
+--   "E"            Same as SCIENTIFIC, e.g. 0.7E+12 (upper case)
 --   "hexadecimal"  E.g. 0x19af
 --   "HEXADECIMAL"  E.g. 0x19AF (upper case)
+--   "hex"          Same as hexadecimal, e.g. 0x19af
+--   "HEX"          Same as HEXADECIMAL, e.g. 0x19AF (upper case)
 --   "auto"         Note: Infinite numbers and NaN always get automatic format.
 --
 function metaFuncs.newToken(tokType, ...)
@@ -1335,15 +1340,20 @@ function metaFuncs.newToken(tokType, ...)
 		-- @Incomplete: Hexadecimal floats.
 		local numStr
 			=  n            ~= n             and "(0/0)"
-			or n            == math.huge     and "(1/0)"
-			or n            == -math.huge    and "(-1/0)"
+			or n            == 1/0           and "(1/0)"
+			or n            == -1/0          and "(-1/0)"
 			or numberFormat == "auto"        and tostring(n)
 			or numberFormat == "integer"     and F("%d", n)
+			or numberFormat == "int"         and F("%d", n)
 			or numberFormat == "float"       and F("%f", n):gsub("(%d)0+$", "%1")
 			or numberFormat == "scientific"  and F("%e", n):gsub("(%d)0+e", "%1e"):gsub("0+(%d+)$", "%1")
 			or numberFormat == "SCIENTIFIC"  and F("%E", n):gsub("(%d)0+E", "%1E"):gsub("0+(%d+)$", "%1")
+			or numberFormat == "e"           and F("%e", n):gsub("(%d)0+e", "%1e"):gsub("0+(%d+)$", "%1")
+			or numberFormat == "E"           and F("%E", n):gsub("(%d)0+E", "%1E"):gsub("0+(%d+)$", "%1")
 			or numberFormat == "hexadecimal" and (n == math.floor(n) and F("0x%x", n) or error("Hexadecimal floats not supported yet."))
 			or numberFormat == "HEXADECIMAL" and (n == math.floor(n) and F("0x%X", n) or error("Hexadecimal floats not supported yet."))
+			or numberFormat == "hex"         and (n == math.floor(n) and F("0x%x", n) or error("Hexadecimal floats not supported yet."))
+			or numberFormat == "HEX"         and (n == math.floor(n) and F("0x%X", n) or error("Hexadecimal floats not supported yet."))
 			or error(F("Invalid number format '%s'.", numberFormat))
 
 		return {type="number", representation=numStr, value=n}