Set up tests for AsObjects, for the AwkwardForth reader

src/uproot/containers.py

@@ -294,6 +294,8 @@ def awkward_form(self, file, context):
             )
 
     def read(self, chunk, cursor, context, file, selffile, parent, header=True):
+        # @aryan26roy: test_0637's tests aren't expected to enter here
+
         classname = cursor.string(chunk, context)
         cursor.skip(1)
         cls = file.class_named(classname)
@@ -424,6 +426,8 @@ def awkward_form(self, file, context):
         )
 
     def read(self, chunk, cursor, context, file, selffile, parent, header=True):
+        # @aryan26roy: test_0637's 00,03,25,27,30,33,35,36,38,39,45,47,51,56,57,58,60,61,63,65,68,70,71,72,73,74,75,78,79
+
         helper_obj = uproot._awkward_forth.GenHelper(context)
 
         if helper_obj.is_forth():
@@ -569,6 +573,8 @@ def awkward_form(self, file, context):
         raise uproot.interpretation.objects.CannotBeAwkward("arbitrary pointer")
 
     def read(self, chunk, cursor, context, file, selffile, parent, header=True):
+        # @aryan26roy: test_0637's 29,45,46,49,50 (Awkward Form discovered at read-time)
+
         return uproot.deserialization.read_object_any(
             chunk, cursor, context, file, selffile, parent
         )
@@ -666,6 +672,8 @@ def awkward_form(self, file, context):
         )
 
     def read(self, chunk, cursor, context, file, selffile, parent, header=True):
+        # @aryan26roy: test_0637's 01,02,23,24,25,26,27,28,30,51,52
+
         helper_obj = uproot._awkward_forth.GenHelper(context)
 
         if helper_obj.is_forth():
@@ -835,6 +843,8 @@ def awkward_form(self, file, context):
         )
 
     def read(self, chunk, cursor, context, file, selffile, parent, header=True):
+        # @aryan26roy: test_0637's (none! untested! but it's just like AsVector)
+
         if self._header and header:
             start_cursor = cursor.copy()
             (
@@ -981,6 +991,8 @@ def awkward_form(self, file, context):
         )
 
     def read(self, chunk, cursor, context, file, selffile, parent, header=True):
+        # @aryan26roy: test_0637's 00,03,04,06,07,08,09,10,11,12,13,14,15,16,17,23,24,26,27,28,31,33,36,38,41,42,43,44,45,46,49,50,55,56,57,58,59,60,61,62,63,67,68,72,73,76,77,80
+
         helper_obj = uproot._awkward_forth.GenHelper(context)
 
         if helper_obj.is_forth():
@@ -1188,6 +1200,8 @@ def awkward_form(self, file, context):
         )
 
     def read(self, chunk, cursor, context, file, selffile, parent, header=True):
+        # @aryan26roy: test_0637's 62,63,64,65,69,70,74,75,77
+
         if self._header and header:
             start_cursor = cursor.copy()
             (
@@ -1342,6 +1356,8 @@ def awkward_form(self, file, context):
         )
 
     def read(self, chunk, cursor, context, file, selffile, parent, header=True):
+        # @aryan26roy: test_0637's 00,33,35,39,47,48,66,67,68,69,70,71,72,73,74,75,76,77,78,79
+
         if self._header and header:
             start_cursor = cursor.copy()
             (

src/uproot/interpretation/objects.py

@@ -355,7 +355,11 @@ def final_array(
 
             start = stop
 
-        if all(uproot._util.from_module(x, "awkward") for x in basket_arrays.values()):
+        if len(basket_arrays) == 0:
+            output = numpy.array([], dtype=self.numpy_dtype)
+        elif all(
+            uproot._util.from_module(x, "awkward") for x in basket_arrays.values()
+        ):
             assert isinstance(library, uproot.interpretation.library.Awkward)
             awkward = library.imported
             output = awkward.concatenate(trimmed, mergebool=False, highlevel=False)

src/uproot/model.py

@@ -796,6 +796,8 @@ def read(cls, chunk, cursor, context, file, selffile, parent, concrete=None):
                     )
 
         if context.get("in_TBranch", False):
+            # @aryan26roy: test_0637's 01,02,05,08,09,11,12,13,15,16,29,35,38,39,44,45,46,47,49,50,52,56
+
             if self._num_bytes is None and self._instance_version != self.class_version:
                 self._instance_version = None
                 cursor = self._cursor

src/uproot/streamers.py

@@ -684,6 +684,9 @@ def class_code(
             key = forth_obj.get_key()\n"""
         )
         read_member_n.append(f"        if member_index == {i}:")
+
+        # @aryan26roy: test_0637's 01,02,08,09,11,12,13,15,16,29,38,45,46,49,50
+
         read_members.append(
             f"        self._bases.append(c({self.name!r}, {self.base_version!r}).read(chunk, cursor, context, file, self._file, self._parent, concrete=self.concrete))"
         )
@@ -801,6 +804,8 @@ def class_code(
             )
             read_member_n.append("    " + read_members[-1].replace("\n", "\n    "))
 
+        # @aryan26roy: test_0637's 29,44,56
+
         read_members.append(
             f"        self._members[{self.name!r}] = cursor.array(chunk, self.member({self.count_name!r}), tmp, context)"
         )
@@ -907,13 +912,19 @@ def class_code(
                 or elements[i + 1].array_length != 0
             ):
                 if len(fields[-1]) == 1:
+                    # @aryan26roy: test_0637's 01,02,29,38,44,56
+
                     read_members.append(
                         f"        self._members[{fields[-1][0]!r}] = cursor.field(chunk, self._format{len(formats) - 1}, context)"
                     )
+
                 else:
                     assign_members = ", ".join(
                         f"self._members[{x!r}]" for x in fields[-1]
                     )
+
+                    # @aryan26roy: test_0637's 01,02,05,08,09,11,12,13,15,16,29,35,39,45,46,47,49,50,56
+
                     read_members.append(
                         f"        {assign_members} = cursor.fields(chunk, self._format{len(formats) - 1}, context)"
                     )
@@ -923,6 +934,8 @@ def class_code(
             )
 
         else:
+            # @aryan26roy: test_0637's 44,56
+
             read_members.append(
                 f"        self._members[{self.name!r}] = cursor.array(chunk, {self.array_length}, self._dtype{len(dtypes)}, context)"
             )
@@ -1185,6 +1198,8 @@ def class_code(
             string_header=True,
         )
 
+        # @aryan26roy: test_0637's 35,38,39,44,45,47,50,56
+
         read_members.append(
             f"        self._members[{self.name!r}] = self._stl_container{len(containers)}.read(chunk, cursor, context, file, self._file, self.concrete)"
         )
@@ -1291,6 +1306,8 @@ def class_code(
         read_member_n.append(f"        if member_index == {i}:")
 
         if self.fType == uproot.const.kObjectp or self.fType == uproot.const.kAnyp:
+            # @aryan26roy: test_0637's (none! untested!)
+
             read_members.append(
                 f"        self._members[{self.name!r}] = c({self.typename.rstrip('*')!r}).read(chunk, cursor, context, file, self._file, self.concrete)"
             )
@@ -1304,6 +1321,8 @@ def class_code(
             )
 
         elif self.fType == uproot.const.kObjectP or self.fType == uproot.const.kAnyP:
+            # @aryan26roy: test_0637's (none! untested!)
+
             read_members.append(
                 f"        self._members[{self.name!r}] = read_object_any(chunk, cursor, context, file, self._file, self)"
             )
@@ -1412,6 +1431,8 @@ def class_code(
     ):
         read_member_n.append(f"        if member_index == {i}:")
 
+        # @aryan26roy: test_0637's 01,02,29,45,46,49,50,56
+
         read_members.append(
             f"        self._members[{self.name!r}] = c({self.typename.rstrip('*')!r}).read(chunk, cursor, context, file, self._file, self.concrete)"
         )

tests/test_0031-test-stl-containers.py

@@ -14,6 +14,31 @@
 from uproot.interpretation.objects import AsObjects
 
 
+@pytest.mark.skip(
+    reason="Implement non-memberwise std::map; we have a sample (map<string,double>)"
+)
+def test_nonmemberwise_asmap():
+    with uproot.open(skhep_testdata.data_path("uproot-issue243.root")) as file:
+        branch = file["triggerList/triggerMap"]
+        interp = uproot.interpretation.identify.interpretation_of(branch, {}, False)
+        py = branch.array(library="np", entry_stop=2)
+
+    with uproot.open(skhep_testdata.data_path("uproot-issue-268.root")) as file:
+        branch = file["aTree/VtxTracks/channels_"]
+        interp = uproot.interpretation.identify.interpretation_of(branch, {}, False)
+        py = branch.array(library="np", entry_stop=2)
+
+    with uproot.open(skhep_testdata.data_path("uproot-issue-268.root")) as file:
+        branch = file["aTree/VtxTracks2TofHits/match_"]
+        interp = uproot.interpretation.identify.interpretation_of(branch, {}, False)
+        py = branch.array(library="np", entry_stop=2)
+
+    with uproot.open(skhep_testdata.data_path("uproot-issue-268.root")) as file:
+        branch = file["aTree/VtxTracks2TofHits/match_inverted_"]
+        interp = uproot.interpretation.identify.interpretation_of(branch, {}, False)
+        py = branch.array(library="np", entry_stop=2)
+
+
 def test_typename():
     with uproot.open(skhep_testdata.data_path("uproot-stl_containers.root"))[
         "tree"