Fixed newToken("string") sometimes making a comment instead of a string (oops). newToken("string") no longer forces long-form for strings with newlines.

Author: ReFreezed

README.md

@@ -1,6 +1,6 @@
 # LuaPreprocess
 
-![version 1.1](https://img.shields.io/badge/version-1.1-limegreen.svg)
+![version 1.1.1](https://img.shields.io/badge/version-1.1.1-limegreen.svg)
 
 A small and straightforward Lua preprocessor featuring a simple syntax.
 Write embedded metaprograms to generate code using normal Lua inside your Lua files.

preprocess.lua

@@ -87,7 +87,7 @@
 
 --============================================================]]
 
-local VERSION = "1.1.0"
+local VERSION = "1.1.1"
 
 local KEYWORDS = {
 	"and","break","do","else","elseif","end","false","for","function","if","in",
@@ -792,7 +792,7 @@ end
 --   keywordToken      = newToken( "keyword",     keyword )
 --   numberToken       = newToken( "number",      number [, numberFormat="auto" ] )
 --   punctuationToken  = newToken( "punctuation", symbol )
---   stringToken       = newToken( "string",      contents [, forceLongForm=false ] )
+--   stringToken       = newToken( "string",      contents [, longForm=false ] )
 --   whitespaceToken   = newToken( "whitespace",  contents )
 --   preprocessorToken = newToken( "pp_entry",    isDouble )
 --
@@ -887,7 +887,7 @@ function metaFuncs.newToken(tokType, ...)
 
 	elseif tokType == "string" then
 		local s, long = ...
-		long = not not (long or s:find"[\r\n]")
+		long = not not long
 
 		local repr
 		if long then
@@ -897,7 +897,7 @@ function metaFuncs.newToken(tokType, ...)
 				equalSigns = equalSigns.."="
 			end
 
-			repr = F("--[%s[%s]%s]", equalSigns, s, equalSigns)
+			repr = F("[%s[%s]%s]", equalSigns, s, equalSigns)
 
 		else
 			repr = F("%q", s):gsub("\\\n", "\\n")

test.lua2p

@@ -59,7 +59,7 @@ print("The end.")
 !(
 --[==[ Test token stuff.
 for i, token in ipairs(assert(tokenize(getFileContents"testInclude.lua"))) do
-	print(i, token.type, "", (token.representation:gsub("\n", "\\n")))
+	print(i, token.type, "", (token.representation:gsub("\n", "<NEWLINE>")))
 end
 
 for _, token in ipairs{
@@ -90,23 +90,23 @@ for _, token in ipairs{
 	newToken("string",      "Hello", true),
 	newToken("string",      "Hello\nworld"),
 	newToken("string",      "Hello\nworld", true),
-	newToken("string",      "Hello\n12]]34"),
-	newToken("string",      "Hello\n12]]=]34"),
+	newToken("string",      "Hello\n12]]34", true),
+	newToken("string",      "Hello\n12]]=]34", true),
 	newToken("whitespace",  " \t\n"),
 	-- newToken("whitespace",  "foo"), -- Error!
 	newToken("pp_entry",    false),
 	newToken("pp_entry",    true),
 	-- newToken("nope",        nil), -- Error!
 } do
 	print("------------------------")
-	print('type  ', token.type)
-	print('value ', (tostring(token.value):gsub("\n", "\\n")))
-	print('repr  ', (token.representation:gsub("\n", "\\n")))
+	print("type  ", token.type)
+	print("value ", (tostring(token.value):gsub("\n", "<NEWLINE>")))
+	print("repr  ", (token.representation :gsub("\n", "<NEWLINE>")))
 	if token.long ~= nil then
-	print('long  ', token.long)
+	print("long  ", token.long)
 	end
 	if token.double ~= nil then
-	print('double', token.double)
+	print("double", token.double)
 	end
 end
 --]==]