extract netCleanUpWires

TODO.md

@@ -1,4 +1,3 @@
-extract `netCleanUpWires`
 extract `netStep`
 extract `netRun`
 

src/lang/graph/Net.ts

@@ -1,11 +1,9 @@
 import { InternalError } from "../errors"
 import { Action, Edge, Node, Port } from "../graph"
 import { Mod } from "../mod"
+import { netCleanUpWires } from "./netCleanUpWires"
 import { netCloseFreePorts } from "./netCloseFreePorts"
-import { netConnect } from "./netConnect"
 import { netReleaseFreePorts } from "./netReleaseFreePorts"
-import { netRemoveEdge } from "./netRemoveEdge"
-import { netRemoveNode } from "./netRemoveNode"
 
 export class Net {
   mod: Mod
@@ -24,26 +22,10 @@ export class Net {
   run(): void {
     const closer = netCloseFreePorts(this)
     while (this.actions.length > 0) this.step()
-    this.cleanUpWires()
+    netCleanUpWires(this)
     netReleaseFreePorts(this, closer)
   }
 
-  cleanUpWires(): void {
-    for (const wire of this.wires) {
-      if (wire.start.connection && wire.end.connection) {
-        netRemoveEdge(this, wire.start.connection.edge)
-        netRemoveEdge(this, wire.end.connection.edge)
-
-        netRemoveNode(this, wire.start.node)
-        netRemoveNode(this, wire.end.node)
-
-        netConnect(this, wire.start.connection.port, wire.end.connection.port)
-      }
-    }
-
-    this.wires = []
-  }
-
   private step(): void {
     if (this.portStack.length !== 0) {
       throw new InternalError("I can not handle free port during stepping.")

src/lang/graph/netCleanUpWires.ts

@@ -0,0 +1,20 @@
+import { Net } from "./Net"
+import { netConnect } from "./netConnect"
+import { netRemoveEdge } from "./netRemoveEdge"
+import { netRemoveNode } from "./netRemoveNode"
+
+export function netCleanUpWires(net: Net): void {
+  for (const wire of net.wires) {
+    if (wire.start.connection && wire.end.connection) {
+      netRemoveEdge(net, wire.start.connection.edge)
+      netRemoveEdge(net, wire.end.connection.edge)
+
+      netRemoveNode(net, wire.start.node)
+      netRemoveNode(net, wire.end.node)
+
+      netConnect(net, wire.start.connection.port, wire.end.connection.port)
+    }
+  }
+
+  net.wires = []
+}

src/lang/mod/Mod.ts

@@ -1,6 +1,7 @@
 import { Def } from "../def"
 import * as Defs from "../defs"
 import { Net, Port } from "../graph"
+import { netCleanUpWires } from "../graph/netCleanUpWires"
 import { Rule } from "../rule"
 import { builtInOperators } from "./builtInOperators"
 
@@ -64,7 +65,7 @@ export class Mod {
   buildNet(name: string): Net {
     const net = new Net(this)
     this.getNetDefOrFail(name).refer(net)
-    net.cleanUpWires()
+    netCleanUpWires(net)
     return net
   }