Fixed evaluate() sometimes raising an error instead of returning it.

Checking for duplicate names in `!!...`.
Added more tests.

Author: ReFreezed

preprocess-cl.lua

@@ -536,7 +536,7 @@ for i, pathIn in ipairs(pathsIn) do
 			-- it's better if the user can choose whether to handle a message or not!
 			--
 			if lua == nil and type(messageHandler) == "function" then
-				return assert(pp.getFileContents(name))
+				return assert(pp.readFile(name))
 			end
 
 			return lua

preprocess.lua

@@ -1136,7 +1136,7 @@ end
 -- value = evaluate( expression [, environment=getfenv() ] )
 -- Returns nil and a message on error.
 local function evaluate(expression, env)
-	local chunk, err = loadLuaString("return "..expression, "@", (env or getfenv(2)))
+	local chunk, err = loadLuaString("return "..expression, "@<evaluate>", (env or getfenv(2)))
 	if not chunk then
 		return nil, F("Invalid expression '%s'. (%s)", expression, (err:gsub("^:%d+: ", "")))
 	end
@@ -1145,7 +1145,10 @@ local function evaluate(expression, env)
 		return nil, F("Ambiguous expression '%s'. (Comma-separated list?)", expression)
 	end
 
-	return (chunk())
+	local ok, valueOrErr = pcall(chunk)
+	if not ok then  return nil, valueOrErr  end
+
+	return valueOrErr -- May be nil or false!
 end
 
 
@@ -2658,6 +2661,8 @@ local function astParseMetaLine(tokens)
 			tokNext, iNext = getNextUsableToken(tokens, tokens.nextI, nil, 1)
 		end
 
+		local usedNames = {}
+
 		while true do
 			if not isTokenAndNotNil(tokNext, "identifier") then
 				local tok = tokNext or tokens[#tokens]
@@ -2666,10 +2671,18 @@ local function astParseMetaLine(tokens)
 					(astOutNode.names[1] and "" or "'local' or "),
 					getRelativeLocationText(ppEntryTok, tok)
 				)
+			elseif usedNames[tokNext.value] then
+				errorAtToken(
+					tokNext, nil, "Parser/DualCodeLine", "Duplicate name '%s' in %s. (Preprocessor line starts %s)",
+					tokNext.value,
+					(astOutNode.isDeclaration and "declaration" or "assignment"),
+					getRelativeLocationText(ppEntryTok, tokNext)
+				)
 			end
-			tableInsert(astOutNode.names, tokNext.value) -- @Robustness: Check for duplicate names.
-			tokens.nextI   = iNext + 1 -- after the identifier
-			tokNext, iNext = getNextUsableToken(tokens, tokens.nextI, nil, 1)
+			tableInsert(astOutNode.names, tokNext.value)
+			usedNames[tokNext.value] = tokNext
+			tokens.nextI             = iNext + 1 -- after the identifier
+			tokNext, iNext           = getNextUsableToken(tokens, tokens.nextI, nil, 1)
 
 			if not isTokenAndNotNil(tokNext, "punctuation", ",") then  break  end
 			tokens.nextI   = iNext + 1 -- after ','
@@ -2911,7 +2924,7 @@ local function astParseMacro(params, tokens)
 	-- @insert identifier ( argument1, ... )
 	elseif isTokenAndNotNil(tokNext, "punctuation", "(") then
 		-- Apply the same 'ambiguous syntax' rule as Lua. (Will comments mess this check up?)
-		if isTokenAndNotNil(tokens[iNext-1], "whitespace") and tokens[iNext-1].value:find"\n" then
+		if isTokenAndNotNil(tokens[iNext-1], "whitespace") and tokens[iNext-1].value:find("\n", 1, true) then
 			errorAtToken(tokNext, nil, "Parser/Macro", "Ambiguous syntax near '(' - part of macro, or new statement?")
 		end
 

tests/quickTest.lua2p

@@ -218,7 +218,7 @@ print("The end.")
 
 !(
 --[==[ Test token stuff.
-for i, token in ipairs(assert(tokenize(assert(getFileContents"tests/quickTestInclude.lua")))) do
+for i, token in ipairs(assert(tokenize(assert(readFile"tests/quickTestInclude.lua")))) do
 	print(i, token.type, "", (token.representation:gsub("\n", "<NEWLINE>")))
 end
 

tests/runTestSuite.cmd

@@ -3,4 +3,7 @@ CD /D "%~dp0.."
 
 IF NOT EXIST local  MD local
 
-lua tests/suite.lua
+SET _lua=%1
+IF [%_lua%]==[]  SET _lua=lua
+
+%_lua% tests/suite.lua

tests/suite.lua

@@ -11,12 +11,16 @@ local results = {}
 local function doTest(description, f, ...)
 	print("Running test: "..description)
 
-	-- f(...) -- DEBUG
 	local ok, err = pcall(f, ...)
 	if not ok then  print("Error: "..tostring(err))  end
 
 	table.insert(results, {description=description, ok=ok})
 end
+local function doTestUnprotected(description, f, ...)
+	print("Running test: "..description)
+	f(...)
+	table.insert(results, {description=description, ok=true})
+end
 local function addLabel(label)
 	table.insert(results, {label=label})
 end
@@ -158,6 +162,9 @@ doTest("Dual code", function()
 		!!local n, s = 5^5, "foo".."bar";
 	]]})
 	assertCodeOutput(luaOut, [[local n, s = 3125, "foobar";]])
+
+	-- Invalid: Duplicate names.
+	assert(not pp.processString{ code=[[ !!x, y, x = 0 ]]})
 end)
 
 doTest("Expression or not?", function()
@@ -314,7 +321,7 @@ doTest("Macros", function()
 	]]})
 	assertCodeOutput(luaOut, [[v = woof_woof_woof_woof_woof_woof_woof_woof]])
 
-	-- Code blocks in macros.
+	-- Metaprogram code in macros.
 	assertCodeOutput(assert(pp.processString{ code=[[  !(function ECHO(v) return v end)  n = @@ECHO( !(  1 ) )                 ]]}), [[n = 1]]            )
 	assertCodeOutput(assert(pp.processString{ code=[[  !(function ECHO(v) return v end)  n = @@ECHO( !!("1") )                 ]]}), [[n = 1]]            )
 	assertCodeOutput(assert(pp.processString{ code=[[  !(function ECHO(v) return v end)  n = @@ECHO{ !(  1 ) }                 ]]}), [[n = { 1 }]]        )
@@ -336,6 +343,24 @@ doTest("Macros", function()
 	assertCodeOutput(assert(pp.processString{ code=[[  !(function ECHO(v) return v end)  n = @@ECHO( !(do outputLua"1" end) )  ]]}), [[n = 1]]            )
 	assertCodeOutput(assert(pp.processString{ code=[[  !(function ECHO(v) return v end)  n = @@ECHO{ !(do outputLua"1" end) }  ]]}), [[n = { 1 }]]        )
 
+	local luaOut = assert(pp.processString{ code=[[
+		!function ECHO(v)  return v  end
+		n = @@ECHO(
+			!outputLua("1")
+		)
+	]]})
+	assertCodeOutput(luaOut, [[n = 1]])
+
+	-- Prefixes/suffixes.
+	assert(pp.processString{ macroPrefix="MACRO_", code=[[
+		!local function MACRO_FOO() return "" end
+		@@FOO()
+	]]})
+	assert(pp.processString{ macroSuffix="_MACRO", code=[[
+		!local function FOO_MACRO() return "" end
+		@@FOO()
+	]]})
+
 	-- Invalid code in arguments (which is ok).
 	local luaOut = assert(pp.processString{ code=[[
 		!function BINOP(operator, a, b)  return a..operator..b  end
@@ -591,10 +616,13 @@ doTest("Resources and evaluation", function()
 		onInsert = function(name)  return name  end,
 	})
 
-	assert(pp.processString{
-		code     = [[ !x = 8 ; assert(evaluate("2^x") == 2^x) ]],
-		onInsert = function(name)  return name  end,
-	})
+	_G.   x = 8 ; assert(pp.evaluate("2^x"       ) == 2^x) ; _G.x = nil
+	local x = 8 ; assert(pp.evaluate("2^x", {x=x}) == 2^x)
+	assert(not pp.evaluate("2^x")) -- (Global) x should be nil.
+
+	if jit then
+		assert(assert(pp.evaluate"0b101") == 5)
+	end
 end)
 
 doTest("Indentation", function()
@@ -603,6 +631,9 @@ doTest("Indentation", function()
 	assert(pp.getIndentation(" \t foo") == " \t ")
 	assert(pp.getIndentation(" \n foo") == " ")
 
+	assertCodeOutput(assert(pp.processString{ code=    "\t   \tindent = !(getCurrentIndentationInOutput(4))"    }), [[indent = 8]])
+	assertCodeOutput(assert(pp.processString{ code="\n\n\t   \tindent = !(getCurrentIndentationInOutput(4))\n\n"}), [[indent = 8]])
+
 	-- Spaces.
 	local indent, expect = pp.getIndentation(""        , 4), 0  ; if indent ~= expect then  error(expect.." "..indent)  end
 	local indent, expect = pp.getIndentation(" "       , 4), 1  ; if indent ~= expect then  error(expect.." "..indent)  end
@@ -626,6 +657,9 @@ end)
 doTest("Misc.", function()
 	local pp = ppChunk()
 
+	assert(pp.metaEnvironment.table == table)
+
+	-- Natural comparisons.
 	assert(                 ("foo9" < "foo10") == false)
 	assert(pp.compareNatural("foo9",  "foo10") == true )
 
@@ -642,6 +676,11 @@ doTest("Misc.", function()
 			assert(keys[order] == k)
 		end
 	end
+
+	-- Current output.
+	assertCodeOutput(assert(pp.processString{ code="x = 1 ; y = !(getOutputSoFar())"                                               }), 'x = 1 ; y = "x = 1 ; y = "')
+	assertCodeOutput(assert(pp.processString{ code="x = !(getOutputSoFarOnLine        ())\n\ty = !(getOutputSoFarOnLine        ())"}), 'x = "x = "\n\ty = "\\ty = "')
+	assertCodeOutput(assert(pp.processString{ code="x = !(getCurrentLineNumberInOutput())\n\ty = !(getCurrentLineNumberInOutput())"}), "x = 1\n\ty = 2")
 end)