Merge pull request #17 from Roboneet/glitchfix

handle Tuple{} and Tuple

Author: MikeInnes

src/anonymous.jl

@@ -93,5 +93,5 @@ function lower_anon(T::DataType)
 end
 
 tags[:jl_anonymous] = function (d)
-  constructtype(d[:typename].wrapper, d[:params]...)
+  constructtype(d[:typename].wrapper, d[:params])
 end

src/extensions.jl

@@ -42,10 +42,10 @@ function lower(v::DataType)
            :params => [v.parameters...])
 end
 
-constructtype(T) = T
-constructtype(T, Ts...) = T{Ts...}
+constructtype(T, Ts) = (length(Ts) == 0) ? T : T{Ts...}
+constructtype(T::Type{Tuple}, Ts) = T{Ts...}
 
-tags[:datatype] = d -> constructtype(resolve(d[:name]), d[:params]...)
+tags[:datatype] = d -> constructtype(resolve(d[:name]), d[:params])
 
 lower(v::UnionAll) =
   BSONDict(:tag => "unionall",

src/write.jl

@@ -47,7 +47,7 @@ ismutable(T) = !isbitstype(T)
 ismutable(::Type{String}) = false
 
 typeof_(x) = typeof(x)
-typeof_(T::Type) = Type{T}
+typeof_(T::DataType) = T
 
 function _lower_recursive(x, cache, refs)
   _lower(x) = applychildren!(x -> _lower_recursive(x, cache, refs), lower(x)::Primitive)

test/runtests.jl

@@ -7,6 +7,10 @@ mutable struct Foo
   x
 end
 
+struct T{A}
+  x::A
+end
+
 @testset "BSON" begin
 
 @testset "Primitive Types" begin
@@ -16,6 +20,7 @@ end
   @test roundtrip_equal(UInt8[1,2,3])
   @test roundtrip_equal("b")
   @test roundtrip_equal([1,"b"])
+  @test roundtrip_equal(Tuple)
 end
 
 @testset "Complex Types" begin
@@ -29,6 +34,7 @@ end
   @test roundtrip_equal(Array{Real}(rand(2,3)))
   @test roundtrip_equal(1+2im)
   @test roundtrip_equal(Dict("a"=>1))
+  @test roundtrip_equal(T(()))
 end
 
 @testset "Circular References" begin