Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed locale floating point character #20

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fixed locale floating point character #20

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0cbd6c3
Fixed locale floating point character
kyl3n Jul 27, 2019
a8d5dc7
replace only comma or decimal in floating point integer
kyl3n Aug 26, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions json.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,8 @@ local space_chars = create_set(" ", "\t", "\r", "\n")
local delim_chars = create_set(" ", "\t", "\r", "\n", "]", "}", ",")
local escape_chars = create_set("\\", "/", '"', "b", "f", "n", "r", "t", "u")
local literals = create_set("true", "false", "null")
local locale_character = (string.match(tostring(1/2),'%p')) -- return point decimal or comma decimal according to the locale


local literal_map = {
[ "true" ] = true,
Expand Down Expand Up @@ -271,14 +273,13 @@ end
local function parse_number(str, i)
local x = next_char(str, i, delim_chars)
local s = str:sub(i, x - 1)
s = s:gsub('[%.%,]',locale_character) -- replace the comma decimal or point decimal with the correct one according to the locale
local n = tonumber(s)
if not n then
decode_error(str, i, "invalid number '" .. s .. "'")
end
return n, x
end


local function parse_literal(str, i)
local x = next_char(str, i, delim_chars)
local word = str:sub(i, x - 1)
Expand Down