Add support for awkward.array.objects.ObjectArray

Author: oschulz

src/UpROOT.jl

@@ -14,6 +14,7 @@ uproot = PyNULL()
 
 include("testdata.jl")
 include("pywrappers.jl")
+include("opaque.jl")
 include("pyjlconv.jl")
 include("tdirectory.jl")
 include("ttree.jl")

src/opaque.jl

@@ -0,0 +1,43 @@
+# This file is a part of UpROOT.jl, licensed under the MIT License (MIT).
+
+const AbstractBlob = AbstractVector{UInt8}
+
+"""
+    UpROOT.OpaqueObject{tp,B<:AbstractVector{UInt8}}
+
+An opaque object of symbolic type `tp`. `tp` must be a `Symbol`. Use the
+`data` field to access the byte representation.
+"""
+struct OpaqueObject{tp,B<:AbstractBlob}
+    data::B
+end
+
+
+OpaqueObject{tp}(data::AbstractBlob) where {tp} = OpaqueObject{tp,typeof(data)}(data)
+
+
+
+"""
+    OpaqueObjectArray{tp,N,BA<:AbstractArray{<:AbstractBlob,N}}
+
+An array of [`UpROOT.OpaqueObject`]s.
+"""
+struct OpaqueObjectArray{tp,N,BA<:AbstractArray{<:AbstractBlob,N}} <: AbstractArray{OpaqueObject{tp},N}
+    data::BA
+end
+
+
+OpaqueObjectArray{tp}(data::AbstractArray{<:AbstractBlob,N}) where {tp,N} = OpaqueObjectArray{tp,N,typeof(data)}(data)
+
+
+Base.size(A::OpaqueObjectArray) = size(A.data)
+
+Base.IndexStyle(A::OpaqueObjectArray) = IndexStyle(A.data)
+
+Base.@propagate_inbounds function Base.getindex(A::OpaqueObjectArray{tp}, idxs::Vararg{Integer,N}) where {tp,N}
+    OpaqueObject{tp}(getindex(A.data, idxs...))
+end
+
+Base.@propagate_inbounds function Base.getindex(A::OpaqueObjectArray{tp}, idxs...) where {tp}
+    OpaqueObjectArray{tp}(getindex(A.data, idxs...))
+end

src/pyjlconv.jl

@@ -21,13 +21,23 @@ function pyjaggedarray2jl(x::PyObject)
 end
 
 
+function awkwardobjectarray2jl(x::PyObject)
+    tp = Symbol(x.generator.cls.__name__)
+    data = pyjaggedarray2jl(x._content)
+
+    OpaqueObjectArray{tp}(data)
+end
+
+
 py2jl(x::Any) = x
 
 function py2jl(x::PyObject)
     if pybuiltin(:isinstance)(x, awkward.JaggedArray)
         pyjaggedarray2jl(x)
-    elseif pybuiltin(:isinstance)(x, awkward.array.base.AwkwardArray)
+    elseif pybuiltin(:isinstance)(x, awkward.array.table.Table)
         Table(_dict2nt(x._contents))
+    elseif pybuiltin(:isinstance)(x, awkward.array.objects.ObjectArray)
+        awkwardobjectarray2jl(x)
     elseif pybuiltin(:isinstance)(x, uproot.rootio.ROOTDirectory)
         TDirectory(x)
     elseif pybuiltin(:isinstance)(x, uproot.tree.TTreeMethods)