Fix issue reported on discourse where allow_inf not being passed thro… (#159)

* Fix issue reported on discourse where allow_inf not being passed through for nested custom structs

* fix test

* fx

* ffx

* fxxx

Author: quinnj

src/structs.jl

@@ -74,9 +74,9 @@ end
 
 @inline function read(::Struct, buf, pos, len, b, ::Type{Any}; allow_inf::Bool=false, kw...)
     if b == UInt8('{')
-        return read(DictType(), buf, pos, len, b, Dict{String, Any}; kw...)
+        return read(DictType(), buf, pos, len, b, Dict{String, Any}; allow_inf=allow_inf, kw...)
     elseif b == UInt8('[')
-        return read(ArrayType(), buf, pos, len, b, Base.Array{Any}; kw...)
+        return read(ArrayType(), buf, pos, len, b, Base.Array{Any}; allow_inf=allow_inf, kw...)
     elseif b == UInt8('"')
         return read(StringType(), buf, pos, len, b, String; kw...)
     elseif b == UInt8('n')

test/gentypes.jl

@@ -250,7 +250,7 @@
         include(file_path)
         parsed = JSON3.read(json, Vector{JSONTypes.Root})
 
-        @test !(JSONTypes.Root.mutable)
+        @test !ismutabletype(JSONTypes.Root)
         @test parsed[1].c.d == 4
         @test fieldtype(JSONTypes.Root, 1) == Union{Int64, String}
     end

test/runtests.jl

@@ -1,5 +1,9 @@
 using Test, JSON3, StructTypes, UUIDs, Dates
 
+if !isdefined(Base, :ismutabletype)
+    ismutabletype(T) = T.mutable
+end
+
 struct data
     t :: Tuple{Symbol, String}
 end
@@ -129,6 +133,14 @@ struct Wrapper
     x::NamedTuple{(:a, :b), Tuple{Int, String}}
 end
 
+struct NaNStruct
+    x::Float64
+end
+
+StructTypes.StructType(::Type{NaNStruct}) = StructTypes.CustomStruct()
+StructTypes.lower(x::NaNStruct) = x.x
+StructTypes.construct(::Type{NaNStruct}, x) = NaNStruct(x)
+
 @testset "JSON3" begin
 
 @testset "read.jl" begin
@@ -910,8 +922,11 @@ x = JSON3.read(json; jsonlines=true)
 # allow_inf consistency
 @test_throws ArgumentError JSON3.read("-Infinity")
 
+# https://discourse.julialang.org/t/json3-jl-parse-custom-type-with-nan/61295
+str = JSON3.write(NaNStruct(NaN); allow_inf=true)
+@test JSON3.read(str, NaNStruct; allow_inf=true).x === NaN
+
 include("gentypes.jl")
+include("stringnumber.jl")
 
 end # @testset "JSON3"
-
-include("stringnumber.jl")

test/stringnumber.jl

@@ -37,7 +37,7 @@ end
 end
 
 @inline function mutable_struct_equality(a::T, b::T)::Bool where T
-    if isstructtype(T) && T.mutable
+    if isstructtype(T) && ismutabletype(T)
         T_fieldnames = fieldnames(T)
         T_num_fieldnames = length(T_fieldnames)
         temp_vector = Vector{Bool}(undef, T_num_fieldnames)