Added new Markdown parser (for GitHub Flavored Markdown). Phew!

Added xml.decodeEntities().
Added data parser for plain text files.

Author: ReFreezed

build/build.lua

@@ -93,6 +93,9 @@ traverseDirectory("src", function(pathIn)
 			makeDirectoryRecursive(dir)
 		end
 
+		metaEnv.constants = {}
+		metaEnv.statics   = {}
+
 		pp.processFile{
 			pathIn   = pathIn,
 			pathOut  = pathOut,
@@ -102,6 +105,35 @@ traverseDirectory("src", function(pathIn)
 			backtickStrings = true,
 			canOutputNil    = false,
 
+			onAfterMeta = function(lua)
+				local               header, _, rest = lua:match"^(#![^\n]*\n%-%-%[(=*)%[.-%]%2%]\n)(.*)"
+				if not header then  header, _, rest = lua:match          "^(%-%-%[(=*)%[.-%]%2%]\n)(.*)"
+				if not header then  header, _, rest = "", nil, lua
+				end end
+
+				local buffer = {}
+				table.insert(buffer, header)
+
+				for _, constName in ipairs(metaEnv.constants) do
+					table.insert(buffer, "local ")
+					table.insert(buffer, constName)
+					table.insert(buffer, " = ")
+					table.insert(buffer, pp.toLua(constants[constName]))
+					table.insert(buffer, "\n")
+				end
+				for _, staticName in ipairs(metaEnv.statics) do
+					table.insert(buffer, "local ")
+					table.insert(buffer, staticName)
+					table.insert(buffer, " = ")
+					table.insert(buffer, pp.toLua(statics[staticName]))
+					table.insert(buffer, "\n")
+				end
+
+				table.insert(buffer, rest)
+
+				return table.concat(buffer)
+			end,
+
 			onError = function(err)
 				os.exit(1)
 			end,

build/meta.lua

@@ -10,17 +10,22 @@
 --==============================================================
 
 	ARGS
+	ASSERT
+	BYTE
+	CONST, CONSTSET, STATIC
 	convertTextFileEncoding, addBomToUft16File
 	copyFile, copyFilesInDirectory, copyDirectoryRecursive
 	errorf
 	execute, executeRequired
 	F
 	getReleaseVersion
+	getStringBytes
 	indexOf
+	IS_CHAR
 	isFile, isDirectory
 	loadParams
 	makeDirectory, makeDirectoryRecursive, removeDirectory, removeDirectoryRecursive
-	NOSPACE
+	NOSPACE, NOSPACE0
 	PUSH_CONTEXT, POP_CONTEXT
 	readFile, writeFile, writeTextFile
 	Set
@@ -34,7 +39,8 @@
 
 --============================================================]]
 
-_G.F = string.format
+_G.BYTE = string.byte
+_G.F    = string.format
 
 
 
@@ -371,10 +377,16 @@ end
 
 
 
+-- Remove spaces.
 function _G.NOSPACE(s)
 	return (s:gsub(" +", ""))
 end
 
+-- Remove spaces and replace NULL bytes with new spaces afterwards.
+function _G.NOSPACE0(s)
+	return (s:gsub(" +", ""):gsub("%z", " "))
+end
+
 
 
 do
@@ -401,7 +413,7 @@ do
 
 					__LUA(F(
 						"if %s then  errorf(%d, \"Bad argument #%d '%s'. (Expected %s, got %%s)\", type(%s))  end",
-						ifFormat:format(argName, typesCode),
+						F(ifFormat, argName, typesCode),
 						errLevel + 1,
 						n,
 						argName,
@@ -431,7 +443,7 @@ end
 
 
 function errorf(s, ...)
-	error(s:format(...), 2)
+	error(F(s, ...), 2)
 end
 
 
@@ -476,3 +488,96 @@ function _G.Set(values)
 end
 
 
+
+local function compare(v1, v2)
+	if type(v1) ~= type(v2) then  return false     end
+	if type(v1) ~= "table"  then  return v1 == v2  end
+
+	for k in pairs(v1) do
+		if not compare(v1[k], v2[k]) then  return false  end
+	end
+	for k in pairs(v2) do
+		if v1[k] == nil then  return false  end
+	end
+
+	return true
+end
+
+-- name = @@CONST{ ... }
+function _G.CONST(tCode)
+	local t = assert(loadstring("return "..tCode))()
+
+	for _, constName in ipairs(constants) do
+		if compare(constants[constName], t) then  return constName  end
+	end
+
+	local constName = "CONST" .. (#constants+1)
+	table.insert(constants, constName)
+	constants[constName] = t
+
+	return constName
+end
+
+-- name = @@CONSTSET{ value1, ... }
+function _G.CONSTSET(valuesCode)
+	return CONST("Set("..valuesCode..")")
+end
+
+-- name = @@STATIC( identifier )
+-- name = @@STATIC{ ... }
+function _G.STATIC(tCodeOrIdent)
+	local staticName, t
+
+	if tCodeOrIdent:find"^{" then
+		staticName = "STATIC" .. (#statics+1)
+		t          = assert(loadstring("return"..tCodeOrIdent))()
+	else
+		staticName = tCodeOrIdent
+		t          = {}
+	end
+
+	assert(not statics[staticName], staticName)
+
+	table.insert(statics, staticName)
+	statics[staticName] = t
+
+	return staticName
+end
+
+
+
+-- @@ASSERT( condition [, message=auto ] )
+function ASSERT(condCode, messageCode)
+	if not DEV then  return ""  end
+
+	messageCode = messageCode or F("%q", "Assertion failed: "..condCode)
+
+	return "if not ("..condCode..") then error("..messageCode..") end"
+end
+
+
+
+-- bool     = @@IS_CHAR( string, position, stringWithOneAsciiCharacter )
+-- true|nil = @@IS_CHAR( string, position, stringWithMultipleAsciiCharacters )
+function _G.IS_CHAR(sCode, posCode, cCode)
+	local c = assert(loadstring("return "..cCode))()
+	assert(type(c) == "string")
+	assert(#c > 0)
+
+	if posCode == "1" then  posCode = ""  end
+
+	if #c == 1 then
+		return F("((%s):byte(%s) == %d)", sCode, posCode, c:byte())
+	else
+		return F("%s[(%s):byte(%s)]", CONSTSET('{getStringBytes'..cCode..'}'), sCode, posCode)
+	end
+end
+
+
+
+-- byte1, ... = getStringBytes( string )
+function _G.getStringBytes(s)
+	return s:byte(1, #s)
+end
+
+

examples/testsite/content/tests.md

@@ -102,7 +102,7 @@ One {{* "Space"  }} Allowed
 
 {{fori {5,99,- -8}}}
 - {{it}}
-{{end}}
+{{*end}}
 
 URL: {{ /foo }}
 URL: {{ ./foo }}
@@ -196,26 +196,26 @@ Favorite fruit is neither apple nor banana. :(
 
 {{ for i = 1, 3 }}
 - For {{ i }}
-{{ end }}
+{{* end }}
 
 {{ for 3 }}
-- Short form {{ i }}
-{{ end }}
+* Short form {{ i }}
+{{* end }}
 
 {{ for < 3 }}
 - Backwards {{ i }}
-{{ end }}
+{{* end }}
 
 {{ local n = 3 }}
-{{ while n > 0 }}
-- Countdown #{{ n }}
-{{ n = n-1 }}
-{{ end }}
+{{* while n > 0 }}
+* Countdown #{{ n }}
+{{* n = n-1 }}
+{{* end }}
 
 {{ repeat }}
-{{ n = n+1 }}
+{{* n = n+1 }}
 - Count #{{ n }}
-{{ until n >= 3 }}
+{{* until n >= 3 }}
 
 
 
@@ -224,12 +224,12 @@ Favorite fruit is neither apple nor banana. :(
 Dogs:
 {{ fori dog in data.dogs }}
 - {{ i }}: {{ dog.name }} (age {{ dog.age }})
-{{ end }}
+{{* end }}
 
 Cats, in reverse:
 {{ fori < data.cats.cats }}
 - {{ i }}: {{ it.name }} (age {{ it.age }})
-{{ end }}
+{{* end }}
 
 {{ io.write("JSON: ") ; printObject(data.random) }}
 {{ io.write("XML: ")  ; print(data.barf:getFirstElement()) }}