Upgraded Lua JSON to be compatible with new LPEG

lua/json/decode/strings.lua

@@ -107,12 +107,12 @@ local function generateLexer(options)
 	local escapeMatch = doSimpleSub
 	escapeMatch = escapeMatch + doXSub / decodeX
 	escapeMatch = escapeMatch + doUniSub / options.decodeUnicode
-	if options.additionalEscapes then
-		escapeMatch = escapeMatch + options.additionalEscapes
-	end
 	if options.escapeCheck then
 		escapeMatch = options.escapeCheck * escapeMatch + bad_escape
 	end
+	if options.additionalEscapes then
+		escapeMatch = options.additionalEscapes + escapeMatch
+	end
 	local captureString
 	for i = 1, #quotes do
 		local cap = buildCaptureString(quotes[i], options.badChars, escapeMatch)

lua/json/decode/util.lua

@@ -39,16 +39,6 @@ local function unexpected()
 	local msg = "unexpected character"
 	return build_report(msg)
 end
-local function expected(...)
-	local items = {...}
-	local msg
-	if #items > 1 then
-		msg = "expected one of '" .. table_concat(items, "','") .. "'"
-	else
-		msg = "expected '" .. items[1] .. "'"
-	end
-	return build_report(msg)
-end
 local function denied(item, option)
 	local msg
 	if option then
@@ -113,7 +103,6 @@ end
 
 local util = {
 	unexpected = unexpected,
-	expected = expected,
 	denied = denied,
 	ascii_space = ascii_space,
 	unicode_space = unicode_space,

lua/json/encode.lua

@@ -53,17 +53,12 @@ for _,name in ipairs(modulesToLoad) do
 	loadedModules[name] = mod
 end
 
--- Merges values, assumes all tables are arrays, inner values flattened, optionally constructing output
-local function flattenOutput(out, values)
-	out = not out and {} or type(out) == 'table' and out or {out}
-	if type(values) == 'table' then
-		for _, v in ipairs(values) do
-			out[#out + 1] = v
-		end
-	else
-		out[#out + 1] = values
-	end
-	return out
+-- NOTE: Nested not found, so assume unsupported until use case arises
+local function flattenOutput(out, value)
+    assert(type(value) ~= 'table')
+	out = out or {}
+    out[#out + 1] = value
+    return out
 end
 
 -- Prepares the encoding map from the already provided modules and new config