Small things...

Author: ReFreezed

README.md

@@ -27,7 +27,8 @@ A separate [command line program](preprocess-cl.lua) is available too.
 
 
 ## Example Program
-The exclamation mark (!) is used to indicate what code is part of the metaprogram. ([See screenshot of processing steps with highlighting](misc/processingSteps.png))
+The exclamation mark (!) is used to indicate what code is part of the metaprogram.
+([See screenshot of processing steps with highlighting](https://raw.githubusercontent.com/ReFreezed/LuaPreprocess/master/misc/processingSteps.png))
 
 ```lua
 -- Normal Lua.

misc/quickTest.lua2p

@@ -71,7 +71,7 @@ print("The end.")
 
 !(
 --[==[ Test token stuff.
-for i, token in ipairs(assert(tokenize(getFileContents"quickTestInclude.lua"))) do
+for i, token in ipairs(assert(tokenize(assert(getFileContents"misc/quickTestInclude.lua")))) do
 	print(i, token.type, "", (token.representation:gsub("\n", "<NEWLINE>")))
 end
 
@@ -109,6 +109,8 @@ for _, token in ipairs{
 	-- newToken("whitespace",  "foo"), -- Error!
 	newToken("pp_entry",    false),
 	newToken("pp_entry",    true),
+	newToken("pp_keyword",  "insert"),
+	-- newToken("pp_keyword",  "foo"), -- Error!
 	-- newToken("nope",        nil), -- Error!
 } do
 	print("------------------------")

misc/runQuickTest.cmd

@@ -9,4 +9,4 @@ REM lua preprocess-cl.lua --debug --saveinfo=local/info.lua --data="Hello, world
 REM lua preprocess-cl.lua --debug --saveinfo=local/info.lua --data="Hello, world!" --outputpaths misc/quickTest.lua2p local/quickTest.output.lua
 REM lua preprocess-cl.lua --debug --saveinfo=local/info.lua --data="Hello, world!" --outputpaths misc/quickTest.lua2p local/quickTest.output.lua --linenumbers
 
-lua misc/quickTest.lua
+IF %ERRORLEVEL% EQU 0  lua misc/quickTest.lua

misc/runQuickTestUsingHandler.cmd

@@ -6,4 +6,4 @@ IF NOT EXIST local  MD local
 lua preprocess-cl.lua --debug --saveinfo=local/info.lua --handler=misc/quickTestHandler.lua misc/quickTest.lua2p
 REM lua preprocess-cl.lua --debug --saveinfo=local/info.lua --handler=misc/quickTestHandler.lua --outputpaths misc/quickTest.lua2p local/quickTest.output.lua
 
-lua misc/quickTest.lua
+IF %ERRORLEVEL% EQU 0  lua misc/quickTest.lua

preprocess.lua

@@ -1216,25 +1216,25 @@ end
 --   Create a new token. Different token types take different arguments.
 --   token = newToken( tokenType, ... )
 --
---   commentToken      = newToken( "comment",     contents [, forceLongForm=false ] )
---   identifierToken   = newToken( "identifier",  identifier )
---   keywordToken      = newToken( "keyword",     keyword )
---   numberToken       = newToken( "number",      number [, numberFormat="auto" ] )
---   punctuationToken  = newToken( "punctuation", symbol )
---   stringToken       = newToken( "string",      contents [, longForm=false ] )
---   whitespaceToken   = newToken( "whitespace",  contents )
---   preprocessorToken = newToken( "pp_entry",    isDouble )
---   preprocessorToken = newToken( "pp_keyword",  keyword )
+--   commentToken     = newToken( "comment",     contents [, forceLongForm=false ] )
+--   identifierToken  = newToken( "identifier",  identifier )
+--   keywordToken     = newToken( "keyword",     keyword )
+--   numberToken      = newToken( "number",      number [, numberFormat="auto" ] )
+--   punctuationToken = newToken( "punctuation", symbol )
+--   stringToken      = newToken( "string",      contents [, longForm=false ] )
+--   whitespaceToken  = newToken( "whitespace",  contents )
+--   ppEntryToken     = newToken( "pp_entry",    isDouble )
+--   ppKeywordToken   = newToken( "pp_keyword",  keyword )
 --
---   commentToken      = { type="comment",     representation=string, value=string, long=isLongForm }
---   identifierToken   = { type="identifier",  representation=string, value=string }
---   keywordToken      = { type="keyword",     representation=string, value=string }
---   numberToken       = { type="number",      representation=string, value=number }
---   punctuationToken  = { type="punctuation", representation=string, value=string }
---   stringToken       = { type="string",      representation=string, value=string, long=isLongForm }
---   whitespaceToken   = { type="whitespace",  representation=string, value=string }
---   preprocessorToken = { type="pp_entry",    representation=string, value=string, double=isDouble }
---   preprocessorToken = { type="pp_keyword",  representation=string, value=string }
+--   commentToken     = { type="comment",     representation=string, value=string, long=isLongForm }
+--   identifierToken  = { type="identifier",  representation=string, value=string }
+--   keywordToken     = { type="keyword",     representation=string, value=string }
+--   numberToken      = { type="number",      representation=string, value=number }
+--   punctuationToken = { type="punctuation", representation=string, value=string }
+--   stringToken      = { type="string",      representation=string, value=string, long=isLongForm }
+--   whitespaceToken  = { type="whitespace",  representation=string, value=string }
+--   ppEntryToken     = { type="pp_entry",    representation=string, value=string, double=isDouble }
+--   ppKeywordToken   = { type="pp_keyword",  representation=string, value=string }
 --
 -- Number formats:
 --   "integer"      E.g. 42