Skip to content

support user functions for Inf and NaN #293

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

Closed
hhaensel wants to merge 3 commits into from
Closed

support user functions for Inf and NaN #293

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f08ca5c
support user functions for Inf and NaN
Nov 14, 2024
8b966f4
fix return for isnan
Nov 15, 2024
e37168a
add tests for user-defined Inf and NaN conversion
Nov 15, 2024
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
23 changes: 19 additions & 4 deletions src/write.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,17 +284,32 @@ end
if isinf(x)
# Although this is non-standard JSON, "Infinity" is commonly used.
# See https://docs.python.org/3/library/json.html#infinite-and-nan-number-values.
if sign(x) == -1
@writechar '-'
return if sign(x) == 1
write(RawType(), buf, pos, len, Val(Inf))
else
write(RawType(), buf, pos, len, Val(-Inf))
end
@writechar 'I' 'n' 'f' 'i' 'n' 'i' 't' 'y'
return buf, pos, len
end
if isnan(x)
return write(RawType(), buf, pos, len, Val(NaN))
end
@check Ryu.neededdigits(T)
pos = Ryu.writeshortest(buf, pos, x)
return buf, pos, len
end

function rawbytes(::Val{T}) where T
codeunits(
if T === Inf
"Infinity"
elseif T === -Inf
"-Infinity"
else
"NaN"
end
)
end

const NEEDESCAPE = Set(map(UInt8, ('"', '\\', '\b', '\f', '\n', '\r', '\t')))

function escapechar(b)
Expand Down
13 changes: 13 additions & 0 deletions test/json.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,19 @@ end
@test JSON3.read("Inf"; allow_inf=true) === Inf
@test JSON3.read("Infinity"; allow_inf=true) === Inf
@test JSON3.read("-Infinity"; allow_inf=true) === -Inf

JSON3.rawbytes(::Val{Inf}) = codeunits("1e1000")
JSON3.rawbytes(::Val{-Inf}) = codeunits("__-inf__")
JSON3.rawbytes(::Val{NaN}) = codeunits("__nan__")

@test JSON3.write([Inf], allow_inf=true) == "[1e1000]"
@test JSON3.write([-Inf], allow_inf=true) == "[__-inf__]"
@test JSON3.write([NaN], allow_inf=true) == "[__nan__]"

# delete the methods to avoid affecting other tests
Base.delete_method.(methods(JSON3.rawbytes, (Val{Inf},)))
Base.delete_method.(methods(JSON3.rawbytes, (Val{-Inf},)))
Base.delete_method.(methods(JSON3.rawbytes, (Val{NaN},)))
end

@testset "Char" begin
Expand Down