The child of a base-class can be a dispatch-by-version.

scikit-hep · Dec 2, 2023 · 254cbb0 · 254cbb0
1 parent 158ac58
commit 254cbb0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/src/uproot/_awkward_forth.py b/src/uproot/_awkward_forth.py
@@ -227,9 +227,13 @@ def derive_form(self):
             for child in self._children:
                 if child.name.startswith("base-class "):
                     assert len(child._children) == 1
-                    assert child._children[0].name.startswith("start-of-model ")
-                    assert len(child._children[0]._children) == 1
-                    base_form = child._children[0]._children[0].derive_form()
+                    descendant = child._children[0]
+                    if descendant.name.startswith("dispatch-by-version "):
+                        assert len(descendant._children) == 1
+                        descendant = descendant._children[0]
+                    assert descendant.name.startswith("start-of-model ")
+                    assert len(descendant._children) == 1
+                    base_form = descendant._children[0].derive_form()
                     out["fields"].extend(base_form["fields"])
                     out["contents"].extend(base_form["contents"])
                 else:

diff --git a/tests/test_0637-setup-tests-for-AwkwardForth.py b/tests/test_0637-setup-tests-for-AwkwardForth.py
@@ -349,7 +349,6 @@ def test_07(is_forth):
             assert interp._complete_forth_code is not None
 
 
-# @pytest.mark.skip(reason="AwkwardForth generation not implemented for this case.")
 @pytest.mark.parametrize("is_forth", [False, True])
 def test_08(is_forth):
     # see AwkwardForth testing: A, B, E, P (previously, this hadn't been tested: library="np")
@@ -486,7 +485,6 @@ def test_10(is_forth):
             assert interp._complete_forth_code is not None
 
 
-@pytest.mark.skip(reason="AwkwardForth generation not implemented for this case.")
 @pytest.mark.parametrize("is_forth", [False, True])
 def test_11(is_forth):
     # see AwkwardForth testing: A, B, E, P
@@ -537,7 +535,6 @@ def test_11(is_forth):
             assert interp._complete_forth_code is not None
 
 
-@pytest.mark.skip(reason="AwkwardForth generation not implemented for this case.")
 @pytest.mark.parametrize("is_forth", [False, True])
 def test_12(is_forth):
     # see AwkwardForth testing: A, B, E, P
@@ -586,7 +583,6 @@ def test_12(is_forth):
             assert interp._complete_forth_code is not None
 
 
-@pytest.mark.skip(reason="AwkwardForth generation not implemented for this case.")
 @pytest.mark.parametrize("is_forth", [False, True])
 def test_13(is_forth):
     # see AwkwardForth testing: A, B, E, P