Create FUNDING.yml

Fixes #22

.github/FUNDING.yml

@@ -0,0 +1 @@
+github: rxi

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2015 rxi
+Copyright (c) 2020 rxi
 
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of

README.md

@@ -1,4 +1,4 @@
-# ![json.lua](https://cloud.githubusercontent.com/assets/3920290/9281532/99e5e0cc-42bd-11e5-8fce-eaff2f7fc681.png)  
+# ![json.lua](https://cloud.githubusercontent.com/assets/3920290/9281532/99e5e0cc-42bd-11e5-8fce-eaff2f7fc681.png)
 A lightweight JSON library for Lua
 
 
@@ -6,7 +6,7 @@ A lightweight JSON library for Lua
 * Implemented in pure Lua: works with 5.1, 5.2, 5.3 and JIT
 * Fast: generally outperforms other pure Lua JSON implementations
   ([benchmark scripts](bench/))
-* Tiny: around 290sloc, 9kb
+* Tiny: around 280sloc, 9kb
 * Proper error messages, *eg:* `expected '}' or ',' at line 203 col 30`
 
 

json.lua

@@ -1,13 +1,28 @@
 --
 -- json.lua
 --
--- Copyright (c) 2015 rxi
+-- Copyright (c) 2020 rxi
 --
--- This library is free software; you can redistribute it and/or modify it
--- under the terms of the MIT license. See LICENSE for details.
+-- Permission is hereby granted, free of charge, to any person obtaining a copy of
+-- this software and associated documentation files (the "Software"), to deal in
+-- the Software without restriction, including without limitation the rights to
+-- use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+-- of the Software, and to permit persons to whom the Software is furnished to do
+-- so, subject to the following conditions:
+--
+-- The above copyright notice and this permission notice shall be included in all
+-- copies or substantial portions of the Software.
+--
+-- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+-- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+-- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+-- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+-- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+-- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+-- SOFTWARE.
 --
 
-local json = { _version = "0.1.0" }
+local json = { _version = "0.1.2" }
 
 -------------------------------------------------------------------------------
 -- Encode
@@ -16,29 +31,29 @@ local json = { _version = "0.1.0" }
 local encode
 
 local escape_char_map = {
-  [ "\\" ] = "\\\\",
-  [ "\"" ] = "\\\"",
-  [ "\b" ] = "\\b",
-  [ "\f" ] = "\\f",
-  [ "\n" ] = "\\n",
-  [ "\r" ] = "\\r",
-  [ "\t" ] = "\\t",
+  [ "\\" ] = "\\",
+  [ "\"" ] = "\"",
+  [ "\b" ] = "b",
+  [ "\f" ] = "f",
+  [ "\n" ] = "n",
+  [ "\r" ] = "r",
+  [ "\t" ] = "t",
 }
 
-local escape_char_map_inv = { [ "\\/" ] = "/" }
+local escape_char_map_inv = { [ "/" ] = "/" }
 for k, v in pairs(escape_char_map) do
   escape_char_map_inv[v] = k
 end
 
 
 local function escape_char(c)
-  return escape_char_map[c] or string.format("\\u%04x", c:byte())
+  return "\\" .. (escape_char_map[c] or string.format("u%04x", c:byte()))
 end
 
 
 local function encode_nil(val)
   return "null"
-end 
+end
 
 
 local function encode_table(val, stack)
@@ -50,7 +65,7 @@ local function encode_table(val, stack)
 
   stack[val] = true
 
-  if val[1] ~= nil or next(val) == nil then
+  if rawget(val, 1) ~= nil or next(val) == nil then
     -- Treat as array -- check keys are valid and it is not sparse
     local n = 0
     for k in pairs(val) do
@@ -127,7 +142,7 @@ end
 
 local parse
 
-local function create_set(...) 
+local function create_set(...)
   local res = {}
   for i = 1, select("#", ...) do
     res[ select(i, ...) ] = true
@@ -189,9 +204,9 @@ end
 
 
 local function parse_unicode_escape(s)
-  local n1 = tonumber( s:sub(3, 6),  16 )
-  local n2 = tonumber( s:sub(9, 12), 16 )
-  -- Surrogate pair?
+  local n1 = tonumber( s:sub(1, 4),  16 )
+  local n2 = tonumber( s:sub(7, 10), 16 )
+   -- Surrogate pair?
   if n2 then
     return codepoint_to_utf8((n1 - 0xd800) * 0x400 + (n2 - 0xdc00) + 0x10000)
   else
@@ -201,54 +216,42 @@ end
 
 
 local function parse_string(str, i)
-  local has_unicode_escape = false
-  local has_surrogate_escape = false
-  local has_escape = false
-  local last
-  for j = i + 1, #str do
+  local res = ""
+  local j = i + 1
+  local k = j
+
+  while j <= #str do
     local x = str:byte(j)
 
     if x < 32 then
       decode_error(str, j, "control character in string")
-    end
 
-    if last == 92 then -- "\\" (escape char)
-      if x == 117 then -- "u" (unicode escape sequence)
-        local hex = str:sub(j + 1, j + 5)
-        if not hex:find("%x%x%x%x") then
-          decode_error(str, j, "invalid unicode escape in string")
-        end
-        if hex:find("^[dD][89aAbB]") then
-          has_surrogate_escape = true
-        else
-          has_unicode_escape = true
-        end
+    elseif x == 92 then -- `\`: Escape
+      res = res .. str:sub(k, j - 1)
+      j = j + 1
+      local c = str:sub(j, j)
+      if c == "u" then
+        local hex = str:match("^[dD][89aAbB]%x%x\\u%x%x%x%x", j + 1)
+                 or str:match("^%x%x%x%x", j + 1)
+                 or decode_error(str, j - 1, "invalid unicode escape in string")
+        res = res .. parse_unicode_escape(hex)
+        j = j + #hex
       else
-        local c = string.char(x)
         if not escape_chars[c] then
-          decode_error(str, j, "invalid escape char '" .. c .. "' in string")
+          decode_error(str, j - 1, "invalid escape char '" .. c .. "' in string")
         end
-        has_escape = true
+        res = res .. escape_char_map_inv[c]
       end
-      last = nil
+      k = j + 1
 
-    elseif x == 34 then -- '"' (end of string)
-      local s = str:sub(i + 1, j - 1)
-      if has_surrogate_escape then 
-        s = s:gsub("\\u[dD][89aAbB]..\\u....", parse_unicode_escape)
-      end
-      if has_unicode_escape then 
-        s = s:gsub("\\u....", parse_unicode_escape)
-      end
-      if has_escape then
-        s = s:gsub("\\.", escape_char_map_inv)
-      end
-      return s, j + 1
-    
-    else
-      last = x
+    elseif x == 34 then -- `"`: End of string
+      res = res .. str:sub(k, j - 1)
+      return res, j + 1
     end
+
+    j = j + 1
   end
+
   decode_error(str, i, "expected closing quote for string")
 end
 
@@ -282,7 +285,7 @@ local function parse_array(str, i)
     local x
     i = next_char(str, i, space_chars, true)
     -- Empty / end of array?
-    if str:sub(i, i) == "]" then 
+    if str:sub(i, i) == "]" then
       i = i + 1
       break
     end
@@ -290,7 +293,7 @@ local function parse_array(str, i)
     x, i = parse(str, i)
     res[n] = x
     n = n + 1
-    -- Next token 
+    -- Next token
     i = next_char(str, i, space_chars, true)
     local chr = str:sub(i, i)
     i = i + 1
@@ -308,7 +311,7 @@ local function parse_object(str, i)
     local key, val
     i = next_char(str, i, space_chars, true)
     -- Empty / end of object?
-    if str:sub(i, i) == "}" then 
+    if str:sub(i, i) == "}" then
       i = i + 1
       break
     end
@@ -373,7 +376,12 @@ function json.decode(str)
   if type(str) ~= "string" then
     error("expected argument of type string, got " .. type(str))
   end
-  return ( parse(str, next_char(str, 1, space_chars, true)) )
+  local res, idx = parse(str, next_char(str, 1, space_chars, true))
+  idx = next_char(str, idx, space_chars, true)
+  if idx <= #str then
+    decode_error(str, idx, "trailing garbage")
+  end
+  return res
 end
 
 

test/test.lua

@@ -57,7 +57,7 @@ end)
 
 test("literals", function()
   assert( json.decode("true") == true )
-  assert( json.encode(true) == "true" ) 
+  assert( json.encode(true) == "true" )
   assert( json.decode("false") == false )
   assert( json.encode(false) == "false" )
   assert( json.decode("null") == nil )
@@ -66,10 +66,16 @@ end)
 
 
 test("strings", function()
+  local s = ""
+  assert( s == json.decode( json.encode(s) ) )
+  local s = "\\"
+  assert( s == json.decode( json.encode(s) ) )
   local s = "Hello world"
   assert( s == json.decode( json.encode(s) ) )
   local s = "\0 \13 \27"
   assert( s == json.decode( json.encode(s) ) )
+  local s = "\0\r\n\8"
+  assert( s == json.decode( json.encode(s) ) )
 end)
 
 
@@ -91,23 +97,23 @@ test("objects", function()
 end)
 
 
-test("strict decode", function()
-  local t = {
-    '{x : 1}',
-    '{x : hello}',
-    "{'x' : 1}",
-    '{"x" : nil}',
-    '{"x" : 0x10}',
-    '{"x" : 001}',
-    '{"x" : .1}',
-    '{"x" : 1, }',
-    '[1, 2, 3, ]',
-  }
-  for i, v in ipairs(t) do
-    local status = pcall(json.decode, v)
-    assert( not status, fmt("'%s' was parsed without error", v) )
-  end
-end)
+--test("strict decode", function()
+--  local t = {
+--    '{x : 1}',
+--    '{x : hello}',
+--    "{'x' : 1}",
+--    '{"x" : nil}',
+--    '{"x" : 0x10}',
+--    '{"x" : 001}',
+--    '{"x" : .1}',
+--    '{"x" : 1, }',
+--    '[1, 2, 3, ]',
+--  }
+--  for i, v in ipairs(t) do
+--    local status = pcall(json.decode, v)
+--    assert( not status, fmt("'%s' was parsed without error", v) )
+--  end
+--end)
 
 
 test("decode invalid", function()
@@ -125,6 +131,8 @@ test("decode invalid", function()
     '{]',
     '[}',
     '"a',
+    '10 xx',
+    '{}123'
   }
   for i, v in ipairs(t) do
     local status = pcall(json.decode, v)
@@ -157,6 +165,7 @@ test("decode escape", function()
     [ [["\\"]]            ] = '\\',
     [ [["\\\\"]]          ] = '\\\\',
     [ [["\/"]]            ] = '/',
+    [ [["\\u \u263a"]]  ] = [[\u ☺]],
   }
   for k, v in pairs(t) do
     local res = json.decode(k)
@@ -234,5 +243,3 @@ test("encode escape", function()
     assert( res == v, fmt("'%s' was not escaped properly", k) )
   end
 end)
-
-