Updated LuaJSON to version 1.2.1 - fixes incompatibility with LPEG 0.10

Author: nickgammon

lua/json/decode.lua

@@ -15,7 +15,7 @@ local util = require("json.decode.util")
 local setmetatable, getmetatable = setmetatable, getmetatable
 local assert = assert
 local ipairs, pairs = ipairs, pairs
-local string_char = string.char
+local string_char = require("string").char
 
 local require = require
 module("json.decode")

lua/json/decode/array.lua

@@ -7,7 +7,7 @@ local lpeg = require("lpeg")
 local util = require("json.decode.util")
 local jsonutil = require("json.util")
 
-local table_maxn = table.maxn
+local table_maxn = require("table").maxn
 
 local unpack = unpack
 

lua/json/decode/number.lua

@@ -20,7 +20,8 @@ local frac = lpeg.P('.') * digits
 local exp = lpeg.S("Ee") * (lpeg.S("-+") + 0) * digits
 
 local nan = lpeg.S("Nn") * lpeg.S("Aa") * lpeg.S("Nn")
-local inf = (lpeg.P('-') + 0) * lpeg.S("Ii") * lpeg.P("nfinity")
+local inf = lpeg.S("Ii") * lpeg.P("nfinity")
+local ninf = lpeg.P('-') * lpeg.S("Ii") * lpeg.P("nfinity")
 local hex = (lpeg.P("0x") + lpeg.P("0X")) * lpeg.R("09","AF","af")^1
 
 local defaultOptions = {
@@ -36,6 +37,11 @@ strict = {
 	nan = false,
 	inf = false
 }
+
+local nan_value = 0/0
+local inf_value = 1/0
+local ninf_value = -1/0
+
 --[[
 	Options: configuration options for number rules
 		nan: match NaN
@@ -44,7 +50,7 @@ strict = {
 	    exp: match exponent portion  (e1)
 	DEFAULT: nan, inf, frac, exp
 --]]
-local function buildMatch(options)
+local function buildCapture(options)
 	options = options and merge({}, defaultOptions, options) or defaultOptions
 	local ret = int
 	if options.frac then
@@ -56,19 +62,17 @@ local function buildMatch(options)
 	if options.hex then
 		ret = hex + ret
 	end
+	-- Capture number now
+	ret = ret / tonumber
 	if options.nan then
-		ret = ret + nan
+		ret = ret + nan / function() return nan_value end
 	end
 	if options.inf then
-		ret = ret + inf
+		ret = ret + ninf / function() return ninf_value end + inf / function() return inf_value end
 	end
 	return ret
 end
 
-local function buildCapture(options)
-	return buildMatch(options) / tonumber
-end
-
 function register_types()
 	util.register_type("INTEGER")
 end

lua/json/decode/object.lua

@@ -14,13 +14,11 @@ local tostring = tostring
 
 local rawset = rawset
 
-local DecimalLpegVersion = util.DecimalLpegVersion
-
 module("json.decode.object")
 
 -- BEGIN LPEG < 0.9 SUPPORT
 local initObject, applyObjectKey
-if DecimalLpegVersion < 0.9 then
+if not (lpeg.Cg and lpeg.Cf and lpeg.Ct) then
 	function initObject()
 		return {}
 	end
@@ -65,13 +63,22 @@ local function buildCapture(options, global_options)
 	local objectItems
 	local objectItem = (key * ignored * lpeg.P(":") * ignored * value_type)
 	-- BEGIN LPEG < 0.9 SUPPORT
-	if DecimalLpegVersion < 0.9 then
-		objectItems = buildItemSequence(objectItem / applyObjectKey, ignored)
+	if not (lpeg.Cg and lpeg.Cf and lpeg.Ct) then
+		local set_key = applyObjectKey
+		if options.setObjectKey then
+			local setObjectKey = options.setObjectKey
+			set_key = function(tab, key, val)
+				setObjectKey(tab, key, val)
+				return tab
+			end
+		end
+
+		objectItems = buildItemSequence(objectItem / set_key, ignored)
 		objectItems = lpeg.Ca(lpeg.Cc(false) / initObject * objectItems)
 	-- END LPEG < 0.9 SUPPORT
 	else
 		objectItems = buildItemSequence(lpeg.Cg(objectItem), ignored)
-		objectItems = lpeg.Cf(lpeg.Ct(0) * objectItems, rawset)
+		objectItems = lpeg.Cf(lpeg.Ct(0) * objectItems, options.setObjectKey or rawset)
 	end
 
 

lua/json/decode/others.lua

@@ -6,6 +6,8 @@ local lpeg = require("lpeg")
 local jsonutil = require("json.util")
 local util = require("json.decode.util")
 
+local rawset = rawset
+
 -- Container module for other JavaScript types (bool, null, undefined)
 module("json.decode.others")
 
@@ -20,7 +22,8 @@ local undefinedCapture = lpeg.P("undefined")
 local defaultOptions = {
 	allowUndefined = true,
 	null = jsonutil.null,
-	undefined = jsonutil.undefined
+	undefined = jsonutil.undefined,
+	setObjectKey = rawset
 }
 
 default = nil -- Let the buildCapture optimization take place

lua/json/decode/strings.lua

@@ -7,10 +7,9 @@ local util = require("json.decode.util")
 local merge = require("json.util").merge
 
 local tonumber = tonumber
-local string = string
-local string_char = string.char
-local floor = math.floor
-local table_concat = table.concat
+local string_char = require("string").char
+local floor = require("math").floor
+local table_concat = require("table").concat
 
 local error = error
 module("json.decode.strings")

lua/json/decode/util.lua

@@ -6,7 +6,8 @@ local lpeg = require("lpeg")
 local select = select
 local pairs, ipairs = pairs, ipairs
 local tonumber = tonumber
-local string_char = string.char
+local string_char = require("string").char
+local rawset = rawset
 
 local error = error
 local setmetatable = setmetatable
@@ -90,3 +91,8 @@ function get_invalid_character_info(input, index)
 	local last_line = parsed:match("\n([^\n]+.)$") or parsed
 	return line_number, #last_line, bad_character, last_line
 end
+
+function setObjectKeyForceNumber(t, key, value)
+	key = tonumber(key) or key
+	return rawset(t, key, value)
+end

lua/json/encode/array.lua

@@ -8,6 +8,8 @@ local type = type
 local pairs = pairs
 local assert = assert
 
+local table = require("table")
+local math = require("math")
 local table_concat = table.concat
 local math_floor, math_modf = math.floor, math.modf
 

lua/json/encode/calls.lua

@@ -4,6 +4,7 @@
 --]]
 local jsonutil = require("json.util")
 
+local table = require("table")
 local table_concat = table.concat
 
 local select = select

lua/json/encode/number.lua

@@ -5,6 +5,7 @@
 local tostring = tostring
 local assert = assert
 local util = require("json.util")
+local huge = require("math").huge
 
 module("json.encode.number")
 
@@ -20,20 +21,19 @@ strict = {
 }
 
 local function encodeNumber(number, options)
-	local str = tostring(number)
-	if str == "nan" then
+	if number ~= number then
 		assert(options.nan, "Invalid number: NaN not enabled")
 		return "NaN"
 	end
-	if str == "inf" then
+	if number == huge then
 		assert(options.inf, "Invalid number: Infinity not enabled")
 		return "Infinity"
 	end
-	if str == "-inf" then
+	if number == -huge then
 		assert(options.inf, "Invalid number: Infinity not enabled")
 		return "-Infinity"
 	end
-	return str
+	return tostring(number)
 end
 
 function getEncoder(options)