Skip to content

ArrayStructType #61

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

Open
dstahlke wants to merge 1 commit into
base: master
Choose a base branch
from
Open

ArrayStructType #61

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions src/types.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ The subtypes of `AbstractMsgPackType` are:
- [`ExtensionType`](@ref)
- [`AnyType`](@ref)
- [`StructType`](@ref)
- [`ArrayStructType`](@ref)
"""
abstract type AbstractMsgPackType end

Expand Down Expand Up @@ -192,6 +193,9 @@ struct StructType <: AbstractMsgPackType end
@deprecate MutableStructType() StructType() false
@deprecate ImmutableStructType() StructType() false

# FIXME docs
struct ArrayStructType <: AbstractMsgPackType end

#####
##### `msgpack_type`, `to_msgpack`, `from_msgpack` defaults
#####
Expand Down
39 changes: 39 additions & 0 deletions src/unpack.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,45 @@ function unpack_type(io, byte, ::StructType, ::Type{Skip{T}}; strict) where {T}
return Skip{T}()
end

#####
##### `ArrayStructType`
#####

function unpack_type(io, byte, t::ArrayStructType, ::Type{T}; strict) where {T}
if byte <= magic_byte_max(ArrayFixFormat)
item_count = xor(byte, magic_byte_min(ArrayFixFormat))
elseif byte === magic_byte(Array16Format)
item_count = ntoh(read(io, UInt16))
elseif byte === magic_byte(Array32Format)
item_count = ntoh(read(io, UInt32))
else
invalid_unpack(io, byte, t, T)
end
N = fieldcount(T)
if item_count != N
error("field count mismatch (got $item_count, expected $N) encountered in $(io) attempting to read a MsgPack $(t) into a Julia $(T) at position $(position(io))")
end
constructor = (args...) -> construct(T, args...)
Base.@nexprs 32 i -> begin
F_i = fieldtype(T, i)
x_i = unpack_type(io, read(io, UInt8), msgpack_type(F_i), F_i; strict=strict)
N == i && return Base.@ncall i constructor x
end
others = Any[]
for i in 33:N
F_i = fieldtype(T, i)
push!(others, unpack_type(io, read(io, UInt8), msgpack_type(F_i), F_i; strict=strict))
end
return constructor(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13,
x_14, x_15, x_16, x_17, x_18, x_19, x_20, x_21, x_22, x_23, x_24, x_25,
x_26, x_27, x_28, x_29, x_30, x_31, x_32, others...)
end

function unpack_type(io, byte, ::ArrayStructType, ::Type{Skip{T}}; strict) where {T}
unpack_type(io, byte, ArrayType(), Skip{Vector{Any}}; strict=strict)
return Skip{T}()
end

#####
##### `IntegerType`
#####
Expand Down