Skip to content

Commit

Permalink
thirdparty: bump json.lua version to 0.1.2
Browse files Browse the repository at this point in the history
  • Loading branch information
vsergeev committed Dec 13, 2019
1 parent 9eeb8cd commit acd9b65
Show file tree
Hide file tree
Showing 2 changed files with 36 additions and 16 deletions.
4 changes: 2 additions & 2 deletions LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,10 @@ which is licensed under the MIT license:

(end of COPYRIGHT)

LuaRadio packages rxi/json.lua v0.1.0 (https://github.com/rxi/json.lua),
LuaRadio packages rxi/json.lua v0.1.2 (https://github.com/rxi/json.lua),
which is licensed under the MIT license:

Copyright (c) 2015-2016 rxi
Copyright (c) 2019 rxi

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
Expand Down
48 changes: 34 additions & 14 deletions radio/thirdparty/json.lua
Original file line number Diff line number Diff line change
@@ -1,13 +1,28 @@
--
-- json.lua
--
-- Copyright (c) 2015 rxi
-- Copyright (c) 2019 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
Expand Down Expand Up @@ -38,7 +53,7 @@ end

local function encode_nil(val)
return "null"
end
end


local function encode_table(val, stack)
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -234,17 +249,17 @@ local function parse_string(str, i)

elseif x == 34 then -- '"' (end of string)
local s = str:sub(i + 1, j - 1)
if has_surrogate_escape then
if has_surrogate_escape then
s = s:gsub("\\u[dD][89aAbB]..\\u....", parse_unicode_escape)
end
if has_unicode_escape then
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
end
Expand Down Expand Up @@ -282,15 +297,15 @@ 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
-- Read token
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
Expand All @@ -308,7 +323,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
Expand Down Expand Up @@ -373,7 +388,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


Expand Down

0 comments on commit acd9b65

Please sign in to comment.