parse multi-array objects; includes additional array parsing tests

Author: dromer

CHANGELOG.md

@@ -18,6 +18,7 @@ Bugfixes:
 
 * Skip empty values when restoring tables (#348)
 * Only append to table when first value is a float
+* Fix parsing multi-array objects (#373)
 * GUI send/receive config for objects in subpatches
 * DPF: also send BPM value to `__hv_dpf_bpm` when transport is not playing
 * Wwise: use latest Windows SDK available locally instead of hardcoded version

hvcc/interpreters/pd2hv/PdParser.py

@@ -239,6 +239,25 @@ def graph_from_canvas(
         """
         obj_array: Optional[HeavyObject] = None  # an #A (table) object which is currently being parsed
 
+        def finalize_array(array: HeavyObject) -> None:
+            declared_size = array.obj_dict["size"]
+            values_size = len(array.obj_dict["values"])
+            if declared_size != values_size:
+                new_size = max(declared_size, values_size)
+                array.add_warning(
+                    "Table \"{0}\" was declared as having {1} values, "
+                    "but {2} were supplied. It will be resized to {3} "
+                    "values (any unsupplied values will be zeroed).".format(
+                        array.obj_dict["name"],
+                        declared_size,
+                        values_size,
+                        new_size))
+                array.obj_dict["size"] = new_size
+                if new_size < declared_size:
+                    array.obj_dict["values"] = obj_args["values"][:new_size]
+                else:
+                    array.obj_dict["values"].extend([0.0 for _ in range(new_size - declared_size)])
+
         g = pd_graph_class(graph_args, pd_path, pos_x, pos_y)
 
         msg_send: dict = {}
@@ -299,24 +318,8 @@ def graph_from_canvas(
                             # are we restoring an array object?
                             # do some final sanity checks
                             if obj_array is not None:
-                                declared_size = obj_array.obj_dict["size"]
-                                values_size = len(obj_array.obj_dict["values"])
-                                if declared_size != values_size:
-                                    new_size = max(declared_size, values_size)
-                                    obj_array.add_warning(
-                                        "Table \"{0}\" was declared as having {1} values, "
-                                        "but {2} were supplied. It will be resized to {3} "
-                                        "values (any unsupplied values will be zeroed).".format(
-                                            obj_array.obj_dict["name"],
-                                            declared_size,
-                                            values_size,
-                                            new_size))
-                                    obj_array.obj_dict["size"] = new_size
-                                    if new_size < declared_size:
-                                        obj_array.obj_dict["values"] = obj_args["values"][:new_size]
-                                    else:
-                                        obj_array.obj_dict["values"].extend([0.0 for _ in
-                                                                             range(new_size - declared_size)])
+                                finalize_array(obj_array)
+
                                 obj_array = None  # done parsing the array
 
                             # set the subpatch name
@@ -556,7 +559,10 @@ def graph_from_canvas(
                                 gui_recv[index] = obj_args[8]
 
                     elif line[1] == "array":
-                        assert obj_array is None, "#X array object is already being parsed."
+                        # are we still parsing a previous array? finalize it.
+                        if obj_array is not None:
+                            finalize_array(obj_array)
+
                         # array names can have dollar arguments in them.
                         # ensure that they are resolved
                         table_def = self.__resolve_object_args(

tests/unit/test_pdparser.py

@@ -0,0 +1,86 @@
+from pathlib import Path
+
+from hvcc.interpreters.pd2hv.PdParser import PdParser
+
+
+def test_single_array_in_subpatch(tmp_path: Path):
+    pd_path = tmp_path / "single_array_subpatch.pd"
+    pd_path.write_text(
+        """#N canvas 827 239 734 565 12;
+#N canvas 0 0 450 250 (subpatch) 0;
+#X array array1 4 float 2;
+#A color 0;
+#A width 2;
+#X coords 0 1 100 -1 200 140 1;
+#X restore 308 106 graph;
+"""
+    )
+
+    graph = PdParser().graph_from_file(pd_path)
+
+    assert not graph.get_notices().has_error
+
+    subpatch = graph.get_objects()[0]
+    tables = [obj for obj in subpatch.get_objects() if obj.obj_type == "table"]
+
+    assert [table.obj_dict["name"] for table in tables] == ["array1"]
+
+
+def test_multiple_arrays_in_subpatch(tmp_path: Path):
+    pd_path = tmp_path / "multi_array_subpatch.pd"
+    pd_path.write_text(
+        """#N canvas 827 239 734 565 12;
+#N canvas 0 0 450 250 (subpatch) 0;
+#X array array1 100 float 2;
+#A color 0;
+#A width 2;
+#X array array2 100 float 0;
+#A color 0;
+#A width 1;
+#X coords 0 1 100 -1 200 140 1;
+#X restore 308 106 graph;
+"""
+    )
+
+    graph = PdParser().graph_from_file(pd_path)
+
+    assert not graph.get_notices().has_error
+
+    subpatch = graph.get_objects()[0]
+    tables = [obj for obj in subpatch.get_objects() if obj.obj_type == "table"]
+
+    assert [table.obj_dict["name"] for table in tables] == ["array1", "array2"]
+
+
+def test_subpatch_parses_multi_line_arrays(tmp_path: Path):
+    pd_path = tmp_path / "multiline_arrays_subpatch.pd"
+    pd_path.write_text(
+        """#N canvas 827 239 734 565 12;
+#N canvas 0 0 450 250 (subpatch) 0;
+#X array array1 4 float 2;
+#A 0 0 1;
+#A 2 2 3;
+#A color 0;
+#A width 2;
+#X array array2 4 float 0;
+#A 0 4 5;
+#A 2 6 7;
+#A color 0;
+#A width 1;
+#X coords 0 1 100 -1 200 140 1;
+#X restore 308 106 graph;
+"""
+    )
+
+    graph = PdParser().graph_from_file(pd_path)
+
+    assert not graph.get_notices().has_error
+
+    subpatch = graph.get_objects()[0]
+    tables = [obj for obj in subpatch.get_objects() if obj.obj_type == "table"]
+
+    assert [table.obj_dict["name"] for table in tables] == ["array1", "array2"]
+    assert [table.obj_dict["values"] for table in tables] == [
+        [0.0, 1.0, 2.0, 3.0],
+        [4.0, 5.0, 6.0, 7.0],
+    ]