only convert if assigned (#530)

Co-authored-by: Jonas Isensee <[email protected]>

src/data/custom_serialization.jl

@@ -7,7 +7,16 @@ writeas(T::Type) = T
 # respectively. These fall back to convert.
 wconvert(T, x) = convert(T, x)
 rconvert(T, x) = convert(T, x)
-rconvert(::Type{Array{T,N}}, x::Array{T2,N}) where {T, T2, N} = T[rconvert(T, y) for y in x] 
+rconvert(::Type{Array{T,N}}, x::Array{T,N}) where {T,N} = x
+function rconvert(::Type{Array{T,N}}, x::Array{T2,N}) where {T, T2, N}
+    res = Array{T,N}(undef, size(x)...)
+    for i in eachindex(x)
+        if isassigned(x, i)
+            res[i] = rconvert(T, x[i])
+        end
+    end
+    res
+end
 
 # Select an ODR, incorporating custom serialization only if the types do not
 # match
@@ -46,7 +55,7 @@ jlconvert_isinitialized(::ReadRepresentation{T,CustomSerialization{S,ODR}}, ptr:
 
 function jlconvert(::ReadRepresentation{T,CustomSerialization{S,ODR}},
           f::JLDFile, ptr::Ptr, header_offset::RelOffset) where {T,S,ODR}
-    
+
     if ismutabletype(T) && !(T <: Core.SimpleVector)
         # May encounter a self-referential struct that used custom serialization
         # provide an uninitialized struct and later fill it with values
@@ -66,4 +75,4 @@ function jlconvert(::ReadRepresentation{T,CustomSerialization{S,ODR}},
         track_weakref!(f, header_offset, v)
         return v
     end
-end
+end

src/data/reconstructing_datatypes.jl

@@ -526,7 +526,7 @@ See also typestring.
 """
 function shorttypestring(::Type{UnknownType{T, P}}) where {T, P}
     tn = IOBuffer()
-    print(tn, T isa Symbol ? split(string(T),'.')[end] : T.name)
+    print(tn, T isa Symbol ? split(string(T),'.')[end] : T)
     params = P.parameters
     if !isempty(params)
         write(tn, '{')
@@ -566,14 +566,14 @@ function constructrr(f::JLDFile, unk::Type{UnknownType{T,P}}, dt::CompoundDataty
         else
             @warn("read type $(typestring(unk)) was parametrized, but type " *
             "$(T) in workspace is not; reconstructing")
-            
+
         end
     elseif T isa UnionAll
         body = behead(T)
         if length(body.parameters) != length(P.parameters)
-            @warn("read type $(typestring(T)) has a different number of parameters from type " *
+            @warn("read type $(T) has a different number of parameters from type " *
                 "$(T) in workspace; reconstructing")
-            reconstruct_compound(f, typestring(T), dt, field_datatypes)
+            reconstruct_compound(f, string(T), dt, field_datatypes)
         else
             params = [P.parameters...,]
             for i = 1:length(params)