Added macro prefix/suffix settings. (E.g. change @@Assert() into @@macro_assert().)

Author: ReFreezed

preprocess-cl.lua

@@ -59,6 +59,12 @@ exec lua "$0" "$@"
 		--linenumbers
 			Add comments with line numbers to the output.
 
+		--macroprefix=prefix
+			String to prepend to macro names.
+
+		--macrosuffix=suffix
+			String to append to macro names.
+
 		--meta
 			Output the metaprogram to a temporary file (*.meta.lua). Useful if
 			an error happens when the metaprogram runs. This file is removed
@@ -181,6 +187,8 @@ local outputMeta           = false
 local processingInfoPath   = ""
 local silent               = false
 local validate             = true
+local macroPrefix          = ""
+local macroSuffix          = ""
 
 --==============================================================
 --= Local Functions ============================================
@@ -269,7 +277,7 @@ for _, arg in ipairs(args) do
 		processOptions = false
 
 	elseif arg:find"^%-%-data=" or arg:find"^%-d=" then
-		customData = arg:match"^%-%-data=(.*)$" or arg:match"^%-d=(.*)$"
+		customData = arg:gsub("^.-=", "")
 
 	elseif arg == "--backtickstrings" then
 		allowBacktickStrings = true
@@ -279,7 +287,7 @@ for _, arg in ipairs(args) do
 		outputMeta = true
 
 	elseif arg:find"^%-%-handler=" or arg:find"^%-h=" then
-		messageHandlerPath = arg:match"^%-%-handler=(.*)$" or arg:match"^%-h=(.*)$"
+		messageHandlerPath = arg:gsub("^.-=", "")
 
 	elseif arg == "--jitsyntax" then
 		allowJitSyntax = true
@@ -301,7 +309,7 @@ for _, arg in ipairs(args) do
 			errorLine("Cannot specify both --outputextension and --outputpaths")
 		end
 		hasOutputExtension = true
-		outputExtension    = arg:match"^%-%-outputextension=(.*)$"
+		outputExtension    = arg:gsub("^.-=", "")
 
 	elseif arg == "--outputpaths" or arg == "-o" then
 		if hasOutputExtension then
@@ -312,7 +320,7 @@ for _, arg in ipairs(args) do
 		hasOutputPaths = true
 
 	elseif arg:find"^%-%-saveinfo=" or arg:find"^%-i=" then
-		processingInfoPath = arg:match"^%-%-saveinfo=(.*)$" or arg:match"^%-i=(.*)$"
+		processingInfoPath = arg:gsub("^.-=", "")
 
 	elseif arg == "--silent" then
 		silent = true
@@ -323,6 +331,12 @@ for _, arg in ipairs(args) do
 	elseif arg == "--nogc" then
 		collectgarbage("stop")
 
+	elseif arg:find"^%-%-macroprefix=" then
+		macroPrefix = arg:gsub("^.-=", "")
+
+	elseif arg:find"^%-%-macrosuffix=" then
+		macroSuffix = arg:gsub("^.-=", "")
+
 	else
 		errorLine("Unknown option '"..arg:gsub("=.*", "").."'.")
 	end
@@ -479,6 +493,9 @@ for i, pathIn in ipairs(pathsIn) do
 		fastStrings     = fastStrings,
 		validate        = validate,
 
+		macroPrefix     = macroPrefix,
+		macroSuffix     = macroSuffix,
+
 		onInsert = (hasMessageHandler("insert") or nil) and function(name)
 			local lua = sendMessage("insert", pathIn, name)
 

preprocess.lua

@@ -124,7 +124,7 @@
 
 
 
-local PP_VERSION = "1.16.0"
+local PP_VERSION = "1.16.0-dev"
 
 local MAX_DUPLICATE_FILE_INSERTS = 1000 -- @Incomplete: Make this a parameter for processFile()/processString().
 
@@ -193,6 +193,8 @@ local outputFromMetaStack      = nil
 local outputFromMeta           = nil -- Top item in outputFromMetaStack.
 local canOutputNil             = true
 local fastStrings              = false
+local macroPrefix              = ""
+local macroSuffix              = ""
 
 
 
@@ -2206,10 +2208,10 @@ local function expandMacro(tokens, fileBuffers, tokenStack, macroStartTok, isNes
 	end
 
 	-- Start macro wrapper.
-	tableInsert(tokens, newTokenAt({type="identifier",  value="__MACRO",      representation="__MACRO"     }, macroStartTok))
-	tableInsert(tokens, newTokenAt({type="punctuation", value="(",            representation="("           }, macroStartTok))
-	tableInsert(tokens, newTokenAt({type="punctuation", value=")",            representation=")"           }, macroStartTok))
-	tableInsert(tokens, newTokenAt({type="punctuation", value="(",            representation="("           }, macroStartTok))
+	tableInsert(tokens, newTokenAt({type="identifier",  value="__MACRO", representation="__MACRO"}, macroStartTok))
+	tableInsert(tokens, newTokenAt({type="punctuation", value="(",       representation="("      }, macroStartTok))
+	tableInsert(tokens, newTokenAt({type="punctuation", value=")",       representation=")"      }, macroStartTok))
+	tableInsert(tokens, newTokenAt({type="punctuation", value="(",       representation="("      }, macroStartTok))
 
 	--
 	-- Callee.
@@ -2225,6 +2227,10 @@ local function expandMacro(tokens, fileBuffers, tokenStack, macroStartTok, isNes
 	tableInsert(tokens, tokNext)
 	local lastCalleeTok = tokNext
 
+	-- Add macro prefix and suffix. (Note: We only edit the initial identifier in the callee if there are more.)
+	lastCalleeTok.value          = macroPrefix .. lastCalleeTok.value .. macroSuffix
+	lastCalleeTok.representation = lastCalleeTok.value
+
 	-- Maybe add '.field[expr]:method' for rest of callee.
 	tokNext, iNext = getNextUsableToken(tokenStack, #tokenStack, nil, -1)
 
@@ -2670,11 +2676,17 @@ local function _processFileOrString(params, isFile)
 		end
 	end
 
+	macroPrefix = params.macroPrefix or ""
+	macroSuffix = params.macroSuffix or ""
+
 	tokens           = doEarlyExpansions        (tokens, fileBuffers, params, stats)
 	tokens           = doLateExpansionsResources(tokens, fileBuffers, params, stats)
 	tokens           = doLateExpansionsMacros   (tokens, fileBuffers, params, stats)
 	stats.tokenCount = #tokens
 
+	macroPrefix = ""
+	macroSuffix = ""
+
 	-- Generate metaprogram.
 	--==============================================================
 
@@ -3169,6 +3181,8 @@ local function processFileOrString(params, isFile)
 	outputFromMeta           = nil
 	canOutputNil             = true
 	fastStrings              = false
+	macroPrefix              = ""
+	macroSuffix              = ""
 
 	if xpcallOk then
 		return unpack(returnValues, 1, returnValues.n)
@@ -3217,6 +3231,9 @@ local pp = {
 	--   fastStrings     = boolean               -- [Optional] Force fast serialization of string values. (Non-ASCII characters will look ugly.) (Default: false)
 	--   validate        = boolean               -- [Optional] Validate output. (Default: true)
 	--
+	--   macroPrefix     = prefix                -- [Optional] String to prepend to macro names. (Default: "")
+	--   macroSuffix     = suffix                -- [Optional] String to append  to macro names. (Default: "")
+	--
 	--   onInsert        = function( name )      -- [Optional] Called for each @insert"name" instruction. It's expected to return a Lua code string. By default 'name' is a path to a file to be inserted.
 	--   onBeforeMeta    = function( )           -- [Optional] Called before the metaprogram runs.
 	--   onAfterMeta     = function( luaString ) -- [Optional] Here you can modify and return the Lua code before it's written to 'pathOut'.
@@ -3243,6 +3260,9 @@ local pp = {
 	--   fastStrings     = boolean               -- [Optional] Force fast serialization of string values. (Non-ASCII characters will look ugly.) (Default: false)
 	--   validate        = boolean               -- [Optional] Validate output. (Default: true)
 	--
+	--   macroPrefix     = prefix                -- [Optional] String to prepend to macro names. (Default: "")
+	--   macroSuffix     = suffix                -- [Optional] String to append  to macro names. (Default: "")
+	--
 	--   onInsert        = function( name )      -- [Optional] Called for each @insert"name" instruction. It's expected to return a Lua code string. By default 'name' is a path to a file to be inserted.
 	--   onBeforeMeta    = function( )           -- [Optional] Called before the metaprogram runs.
 	--   onError         = function( error )     -- [Optional] You can use this to get traceback information. 'error' is the same value as the second returned value from processString().