Outputted strings now have more characters escaped. onAfterMeta() can now prepend shebang without causing a code validation error.

Author: ReFreezed

misc/runTests.lua

@@ -43,7 +43,9 @@ local function writeFile(path, data)
 end
 
 local function assertCodeOutput(codeOut, codeExpected, message)
-	assert(trim(codeOut) == codeExpected, (message or "Unexpected output: "..codeOut))
+	if trim(codeOut) ~= codeExpected then
+		error(message or "Unexpected output: "..codeOut, 2)
+	end
 end
 local function assertCmd(cmd)
 	local code = os.execute(cmd)
@@ -110,10 +112,7 @@ doTest("Generate code", function()
 	]]
 
 	local luaOut = assert(pp.processString{ code=luaIn })
-	assertCodeOutput(luaOut, ("local s = %q"):format("\n"))
-
-	local luaOut = assert(pp.processString{ code=luaIn, debug=true })
-	assertCodeOutput(luaOut, [[local s = "\n"]]) -- Debug mode changes how newlines appear in string values.
+	assertCodeOutput(luaOut, [[local s = "\n"]])
 end)
 
 doTest("Parsing extended preprocessor line", function()
@@ -296,7 +295,7 @@ print("Results:")
 
 for _, result in ipairs(results) do
 	if result.label then
-		print("------ "..result.label)
+		print("----- "..result.label)
 	elseif result.ok then
 		print("ok      "..result.description)
 	else

preprocess.lua

@@ -761,11 +761,14 @@ function serialize(buffer, v)
 		table.insert(buffer, "}")
 
 	elseif vType == "string" then
-		local s = F("%q", v)
-		if isDebug then
-			s = s:gsub("\\\n", "\\n")
-		end
-		table.insert(buffer, s)
+		-- @Incomplete: Add an option specifically for nice string serialization?
+		local s = v:gsub("[%c\128-\255\"\\]", function(c)
+			local str           = ESCAPE_SEQUENCES[c] or F("\\%03d", c:byte())
+			ESCAPE_SEQUENCES[c] = str
+			return str
+		end)
+
+		table.insert(buffer, '"'..s..'"')
 
 	elseif v == math.huge then
 		table.insert(buffer, "math.huge")
@@ -1979,7 +1982,8 @@ local function _processFileOrString(params, isFile)
 	-- @Incomplete: Maybe add an option to disable this? It might be useful if
 	-- e.g. Lua 5.1 is used to generate Lua 5.3 code (for whatever reason).
 	--
-	local mainChunk, err = loadLuaString(lua, (isFile and params.pathMeta and "@" or "")..pathOut)
+	local luaToCheck     = lua:gsub("^#![^\n]*", "")
+	local mainChunk, err = loadLuaString(luaToCheck, (isFile and params.pathMeta and "@" or "")..pathOut)
 	if not mainChunk then
 		local ln, _err = err:match'^.-:(%d+): (.*)'
 		errorOnLine(pathOut, (tonumber(ln) or 0), nil, "%s", (_err or err))