Skip to content

vendor/jsonx: improve correctness and performance #470

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

Merged
quinnj merged 1 commit into from
Jun 26, 2026
Merged

vendor/jsonx: improve correctness and performance #470

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
28 changes: 13 additions & 15 deletions vendor/jsonx.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,10 @@ end

# Helper function to skip whitespace
function skip_whitespace(str::String, pos::Int, len::Int)
while pos <= len && isspace(Char(codeunit(str, pos)))
while pos <= len
c = codeunit(str, pos)
# JSON whitespace (RFC 8259): space, tab, newline, carriage return
(c == 0x20 || c == 0x09 || c == 0x0A || c == 0x0D) || break
pos += 1
end
return pos
Expand Down Expand Up @@ -206,7 +209,7 @@ end
function parse_array(str::String, pos::Int, len::Int)
codeunit(str, pos) != UInt8('[') && throw(ArgumentError("Expected '[' at position $pos"))
pos += 1
result = []
result = Any[]
pos = skip_whitespace(str, pos, len)
pos > len && throw(ArgumentError("Unexpected end of input in array"))
codeunit(str, pos) == UInt8(']') && return result, pos + 1
Expand Down Expand Up @@ -259,7 +262,9 @@ function parse_number(str::String, pos::Int, len::Int)
has_decimal_or_exp = false
while pos <= len
c = codeunit(str, pos)
if c == UInt8('-') || (UInt8('0') <= c <= UInt8('9')) || c == UInt8('+')
if c == UInt8('-') || (UInt8('0') <= c <= UInt8('9'))
pos += 1
elseif c == UInt8('+') && pos > start_pos # '+' only valid after e/E
pos += 1
elseif c == UInt8('.') || c == UInt8('e') || c == UInt8('E')
has_decimal_or_exp = true
Expand All @@ -270,21 +275,14 @@ function parse_number(str::String, pos::Int, len::Int)
end
num_str = @view str[start_pos:pos-1]

# Try parsing as Int64 if no decimal point or exponent
if !has_decimal_or_exp
try
return Base.parse(Int64, num_str), pos
catch
# Fall back to Float64 if Int64 parsing fails (e.g., overflow)
end
n = tryparse(Int64, num_str)
n !== nothing && return n, pos
end

# Parse as Float64
try
return Base.parse(Float64, num_str), pos
catch
throw(ArgumentError("Invalid number format"))
end
f = tryparse(Float64, num_str)
f !== nothing && return f, pos
throw(ArgumentError("Invalid number format: $num_str"))
end

# JSON writing functionality
Expand Down
6 changes: 6 additions & 0 deletions vendor/test.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,9 @@ include("jsonx.jl")
@test JSONX.parse("\t\n\r null \t\n\r") === nothing
@test JSONX.parse("[ 1 , 2 , 3 ]") == [1, 2, 3]
@test JSONX.parse("{ \"key\" : \"value\" }") == Dict("key" => "value")
# Vertical tab and form feed are NOT valid JSON whitespace (RFC 8259 §2)
@test_throws ArgumentError JSONX.parse("\x0bnull") # vertical tab
@test_throws ArgumentError JSONX.parse("\x0cnull") # form feed
end

@testset "Error Cases" begin
Expand All @@ -108,6 +111,9 @@ include("jsonx.jl")
# Test invalid escape sequences
@test_throws ArgumentError JSONX.parse("\"\\x\"")
@test_throws ArgumentError JSONX.parse("\"\\u123\"")
# Leading '+' is not valid JSON (only '-' is a valid leading sign)
@test_throws ArgumentError JSONX.parse("+1")
@test_throws ArgumentError JSONX.parse("+3.14")
end

@testset "JSON Writing" begin
Expand Down
Loading