Merge pull request #103 from mauro3/m3/fix17

Fix all but one 1.7 issues

src/anonymous.jl

@@ -19,7 +19,7 @@ structdata(meth::Method) =
    _uncompress(meth, meth.source)]
 else
 structdata(meth::Method) =
-  [meth.module, meth.name, meth.file, meth.line, meth.sig, getfield(meth, syms_fieldname), 
+  [meth.module, meth.name, meth.file, meth.line, meth.sig, getfield(meth, syms_fieldname),
    meth.nargs, meth.isva, meth.nospecialize, _uncompress(meth, meth.source)]
 end
 
@@ -66,8 +66,8 @@ function structdata(t::TypeName)
     [t.mt.name, collect(Base.MethodList(t.mt)), t.mt.max_args,
      isdefined(t.mt, :kwsorter) ? t.mt.kwsorter : nothing]
   [Base.string(VERSION), t.name, t.names, primary.super, primary.parameters,
-   primary.types, isdefined(primary, :instance), primary.abstract,
-   primary.mutable, primary.ninitialized, mt]
+   primary.types, isdefined(primary, :instance), isabstracttype(primary),
+   ismutabletype(primary), primary.ninitialized, mt]
 end
 
 # Type Names

src/extensions.jl

@@ -32,6 +32,16 @@ lower(m::Module) = ref(modpath(m)...)
 
 # Types
 
+@static if VERSION < v"1.7.0-DEV"
+  # Borrowed from julia base
+  function ismutabletype(@nospecialize(t::Type))
+      t = Base.unwrap_unionall(t)
+      # TODO: what to do for `Union`?
+      return isa(t, DataType) && t.mutable
+  end
+end
+
+
 ismutable(::Type{<:Type}) = false
 
 typepath(x::DataType) = [modpath(x.name.module)..., x.name.name]
@@ -83,10 +93,8 @@ tags[:array] = d ->
 
 # Structs
 
-isprimitive(T) = fieldcount(T) == 0 && T.size > 0
-
-structdata(x) = isprimitive(typeof(x)) ? reinterpret_(UInt8, [x]) :
-    Any[getfield(x, f) for f in fieldnames(typeof(x))]
+structdata(x) = isprimitivetype(typeof(x)) ? reinterpret_(UInt8, [x]) :
+    Any[getfield(x,f) for f in fieldnames(typeof(x)) if isdefined(x, f)]
 
 function lower(x)
   BSONDict(:tag => "struct", :type => typeof(x), :data => structdata(x))
@@ -103,7 +111,7 @@ function newstruct!(x, fs...)
 end
 
 function newstruct(T, xs...)
-  if !T.mutable
+  if !ismutabletype(T)
     flds = Any[convert(fieldtype(T, i), x) for (i,x) in enumerate(xs)]
     return ccall(:jl_new_structv, Any, (Any,Ptr{Cvoid},UInt32), T, flds, length(flds))
   else
@@ -129,7 +137,7 @@ end
 newprimitive(T, data) = reinterpret_(T, data)[1]
 
 tags[:struct] = d ->
-  isprimitive(d[:type]) ?
+  isprimitivetype(d[:type]) ?
     newprimitive(d[:type], d[:data]) :
     newstruct(d[:type], d[:data]...)
 

src/write.jl

@@ -43,7 +43,7 @@ lower(x::Primitive) = x
 
 import Base: RefValue
 
-ismutable(T) = !isa(T, DataType) || T.mutable
+ismutable(T) = !isa(T, DataType) || ismutabletype(T)
 ismutable(::Type{String}) = false
 
 typeof_(x) = typeof(x)

test/runtests.jl

@@ -8,7 +8,7 @@ end
 
 # avoid hitting bug where
 # Dict{Symbol,T} -> Dict{Symbol,Any}
-function roundtrip_equal(x::Dict{Symbol}) 
+function roundtrip_equal(x::Dict{Symbol})
   y = BSON.roundtrip(x)
   y isa Dict{Symbol} && y == x
 end
@@ -23,6 +23,11 @@ end
 
 struct S end
 
+struct Bar
+  a
+  Bar() = new()
+end
+
 module A
   using DataFrames, BSON
   d = DataFrame(a = 1:10, b = rand(10))
@@ -39,6 +44,22 @@ end
   @test roundtrip_equal("b")
   @test roundtrip_equal([1,"b"])
   @test roundtrip_equal(Tuple)
+  @test roundtrip_equal(Tuple{Int, Float64})
+  @test roundtrip_equal(Vararg{Any})
+end
+
+@testset "Undefined References" begin
+  # from Issue #3
+  d = Dict(:a => 1, :b => Dict(:c => 3, :d => Dict("e" => 5)))
+  @test roundtrip_equal(d)
+
+  # from Issue #43
+  x = Array{String, 1}(undef, 5)
+  x[1] = "a"
+  x[4] = "d"
+  @test_broken roundtrip_equal(Dict(:x => x))
+
+  @test roundtrip_equal(Bar())
 end
 
 @testset "Complex Types" begin
@@ -82,15 +103,19 @@ end
 
 @testset "Anonymous Functions" begin
   f = x -> x+1
-  f2 = BSON.roundtrip(f)
-  @test f2(5) == f(5)
-  @test typeof(f2) !== typeof(f)
-
-  chicken_tikka_masala(y) = x -> x+y
-  f = chicken_tikka_masala(5)
-  f2 = BSON.roundtrip(f)
-  @test f2(6) == f(6)
-  @test typeof(f2) !== typeof(f)
+  if VERSION < v"1.7-"
+    f2 = BSON.roundtrip(f)
+    @test f2(5) == f(5)
+    @test typeof(f2) !== typeof(f)
+
+    chicken_tikka_masala(y) = x -> x+y
+    f = chicken_tikka_masala(5)
+    f2 = BSON.roundtrip(f)
+    @test f2(6) == f(6)
+    @test typeof(f2) !== typeof(f)
+  else
+    @test_throws ErrorException f2 = BSON.roundtrip(f)
+  end
 end
 
 @testset "Int Literals in Type Params #41" begin