[AutoTool] consolidate duplicate code for path() and render()

masque/builder/tools.py

@@ -516,44 +516,6 @@ class AutoTool(Tool, metaclass=ABCMeta):
             self.transitions.setdefault(ooii, self.transitions[iioo].reversed())
         return self
 
-    def path(
-            self,
-            ccw: SupportsBool | None,
-            length: float,
-            *,
-            in_ptype: str | None = None,
-            out_ptype: str | None = None,
-            port_names: tuple[str, str] = ('A', 'B'),
-            **kwargs,
-            ) -> Library:
-        _out_port, data = self.planL(
-            ccw,
-            length,
-            in_ptype = in_ptype,
-            out_ptype = out_ptype,
-            )
-
-        tree, pat = Library.mktree(SINGLE_USE_PREFIX + 'path')
-        pat.add_port_pair(names=port_names, ptype='unk' if in_ptype is None else in_ptype)
-        if data.in_transition:
-            pat.plug(data.in_transition.abstract, {port_names[1]: data.in_transition.their_port_name})
-        if not numpy.isclose(data.straight_length, 0):
-            straight_pat_or_tree = data.straight.fn(data.straight_length, **kwargs)
-            if isinstance(straight_pat_or_tree, Pattern):
-                straight = tree <= {SINGLE_USE_PREFIX + 'straight': straight_pat_or_tree}
-            else:
-                straight = tree <= straight_pat_or_tree
-            pat.plug(straight, {port_names[1]: data.straight.in_port_name})
-        if data.b_transition:
-            pat.plug(data.b_transition.abstract, {port_names[1]: data.b_transition.our_port_name})
-        if data.ccw is not None:
-            assert data.bend is not None
-            pat.plug(data.bend.abstract, {port_names[1]: data.bend.in_port_name}, mirrored=bool(data.ccw) == data.bend.clockwise)
-        if data.out_transition:
-            pat.plug(data.out_transition.abstract, {port_names[1]: data.out_transition.our_port_name})
-
-        return tree
-
     @staticmethod
     def _bend2dxy(bend: Bend, ccw: SupportsBool | None) -> tuple[NDArray[numpy.float64], float]:
         if ccw is None:
@@ -647,23 +609,17 @@ class AutoTool(Tool, metaclass=ABCMeta):
         out_port = Port((length, bend_run), rotation=bend_angle, ptype=out_ptype_actual)
         return out_port, data
 
-    def render(
+    def _renderL(
             self,
-            batch: Sequence[RenderStep],
+            data: LData,
-            *,
+            tree: ILibrary,
-            port_names: Sequence[str] = ('A', 'B'),
+            port_names: tuple[str, str],
-            append: bool = True,
+            append: bool,
-            **kwargs,
             ) -> ILibrary:
-
+        """
-        tree, pat = Library.mktree(SINGLE_USE_PREFIX + 'path')
+        Render an L step into a preexisting tree
-        pat.add_port_pair(names=(port_names[0], port_names[1]))
+        """
-
+        pat = tree.top()
-        for step in batch:
-            data = step.data
-            assert step.tool == self
-
-            if step.opcode == 'L':
         if data.in_transition:
             pat.plug(data.in_transition.abstract, {port_names[1]: data.in_transition.their_port_name})
         if not numpy.isclose(data.straight_length, 0):
@@ -693,6 +649,46 @@ class AutoTool(Tool, metaclass=ABCMeta):
             pat.plug(data.out_transition.abstract, {port_names[1]: data.out_transition.our_port_name})
         return tree
 
+    def path(
+            self,
+            ccw: SupportsBool | None,
+            length: float,
+            *,
+            in_ptype: str | None = None,
+            out_ptype: str | None = None,
+            port_names: tuple[str, str] = ('A', 'B'),
+            **kwargs,
+            ) -> Library:
+        _out_port, data = self.planL(
+            ccw,
+            length,
+            in_ptype = in_ptype,
+            out_ptype = out_ptype,
+            )
+
+        tree, pat = Library.mktree(SINGLE_USE_PREFIX + 'path')
+        pat.add_port_pair(names=port_names, ptype='unk' if in_ptype is None else in_ptype)
+        self._renderL(data=data, tree=tree, port_names=port_names, append=False)
+        return tree
+
+    def render(
+            self,
+            batch: Sequence[RenderStep],
+            *,
+            port_names: Sequence[str] = ('A', 'B'),
+            append: bool = True,
+            **kwargs,
+            ) -> ILibrary:
+
+        tree, pat = Library.mktree(SINGLE_USE_PREFIX + 'path')
+        pat.add_port_pair(names=(port_names[0], port_names[1]))
+
+        for step in batch:
+            assert step.tool == self
+            if step.opcode == 'L':
+                self._renderL(data=step.data, tree=tree, port_names=port_names, append=append)
+        return tree
+
 
 @dataclass
 class PathTool(Tool, metaclass=ABCMeta):