Fixes for null and numeric numbered tables

Author: craigmj

examples/tests.lua

@@ -102,6 +102,17 @@ function testJSON4Lua()
   -- NB: This test can fail because of order: need to test further once
   -- decoding is supported.
   -- assert(r==[[{"age":35,"Name":"Craig","email":"[email protected]"}]])
+
+  -- Test encoding tables with numeric (string) indexes
+  s = {}
+  s['1']='One'
+  r = json.encode(s)
+  -- print("r = ", r)
+  assert(r=='{"1":"One"}')
+
+  s['2']= {One='Uno'}
+  r = json.encode(s)
+  assert(compareData(json.decode(r), s))
 
   -- Test decode_scanWhitespace
   if nil then
@@ -122,7 +133,6 @@ function testJSON4Lua()
   s = [["Test\u00A7\\"]]
   r,e = json._decode_scanString(s,1)
   assert(r=="Test\xC2\xA7\\" and e==9)
-  print(s,r)
 
   -- Test decode_scanNumber
   s = [[354]]
@@ -165,14 +175,13 @@ function testJSON4Lua()
   s = [["Test\u00A7\\\""]]
   r,e = json.decode(s)
   assert(r=="Test\xC2\xA7\\\"", r)
-  print(s,r)
 
   -- Test decode_scanObject
   s = [[ {"one":1, "two":2, "three":"three", "four":true} ]]
   r,e = json.decode(s)
-  for x,y in pairs(r) do
-    print(x,y)
-  end
+  -- for x,y in pairs(r) do
+  --   print(x,y)
+  -- end
   assert(compareData(r,{one=1,two=2,three='three',four=true}))
   s = [[ { "one" : { "first":1,"second":2,"third":3}, "two":2, "three":false } ]]
   r,e = json.decode(s)
@@ -198,6 +207,15 @@ function testJSON4Lua()
       ]]
   r,e = json.decode(s)
   assert(r=='test',"Comment decoding failed")
+
+  -- Per error reported by M.Hund, with incorrect decoding of string-numbered tables
+  s = {}
+  subt = {a="a",b="b",c="c"}
+  s['1'] = subt
+  s['2'] = subt
+  s['3'] = subt
+  r = json.decode('{"1":{"a":"a","b":"b","c":"c"},"2":{"a":"a","b":"b","c":"c"},"3":{"a":"a","b":"b","c":"c"}}')
+  assert(compareData(s, r))
 end
 
 testJSON4Lua()

json/json.lua

@@ -105,7 +105,7 @@ function json.encode (v)
   end
 
   -- Handle null values
-  if vtype=='function' and v==null then
+  if vtype=='function' and v==json.null then
     return 'null'
   end
 
@@ -141,16 +141,16 @@ function json.decode(s, startPos)
     return decode_scanString(s,startPos)
   end
   if string.sub(s,startPos,startPos+1)=='/*' then
-    return decode(s, decode_scanComment(s,startPos))
+    return json.decode(s, decode_scanComment(s,startPos))
   end
   -- Otherwise, it must be a constant
   return decode_scanConstant(s,startPos)
 end
 
 --- The null function allows one to specify a null value in an associative array (which is otherwise
 -- discarded if you set the value with 'nil' in Lua. Simply set t = { first=json.null }
-function null()
-  return null -- so json.null() will also return null ;-)
+function json.null()
+  return json.null -- so json.null() will also return null ;-)
 end
 -----------------------------------------------------------------------------
 -- Internal, PRIVATE functions.
@@ -418,7 +418,8 @@ end
 -- @return boolean True if the object should be JSON encoded, false if it should be ignored.
 function isEncodable(o)
   local t = type(o)
-  return (t=='string' or t=='boolean' or t=='number' or t=='nil' or t=='table') or (t=='function' and o==null) 
+  return (t=='string' or t=='boolean' or t=='number' or t=='nil' or t=='table') or
+     (t=='function' and o==json.null) 
 end
 
 return json