extract netRun

TODO.md

@@ -1,6 +1,7 @@
-extract `netStep`
 extract `netRun`
 
+command change render command to simple run command
+
 quit using `def/` and `defs/`
 
 - `Mod` should have namespaces for

src/console/commands/render-command.ts

@@ -4,6 +4,7 @@ import ty from "@xieyuheng/ty"
 import fs from "fs"
 import Path from "path"
 import { Net } from "../../lang/graph"
+import { netRun } from "../../lang/graph/netRun"
 import { Mod } from "../../lang/mod"
 import { Parser } from "../../lang/syntax"
 import { NetRenderer } from "../../renderers/NetRenderer"
@@ -77,7 +78,7 @@ export class RenderCommand extends Command<Args, Opts> {
 async function renderNet(mod: Mod, file: string, name: string): Promise<void> {
   const net = mod.buildNet(name)
   renderFile(net, `${file}.${name}.initial.txt`)
-  net.run()
+  netRun(net)
   renderFile(net, `${file}.${name}.finial.txt`)
 }
 

src/lang/graph/Net.ts

@@ -1,9 +1,5 @@
-import { InternalError } from "../errors"
 import { Action, Edge, Node, Port } from "../graph"
 import { Mod } from "../mod"
-import { netCleanUpWires } from "./netCleanUpWires"
-import { netCloseFreePorts } from "./netCloseFreePorts"
-import { netReleaseFreePorts } from "./netReleaseFreePorts"
 
 export class Net {
   mod: Mod
@@ -18,21 +14,4 @@ export class Net {
   constructor(mod: Mod) {
     this.mod = mod
   }
-
-  run(): void {
-    const closer = netCloseFreePorts(this)
-    while (this.actions.length > 0) this.step()
-    netCleanUpWires(this)
-    netReleaseFreePorts(this, closer)
-  }
-
-  private step(): void {
-    if (this.portStack.length !== 0) {
-      throw new InternalError("I can not handle free port during stepping.")
-    }
-
-    const action = this.actions.pop()
-    if (action === undefined) return
-    else action.act(this.mod, this)
-  }
 }

src/lang/graph/netRun.ts

@@ -0,0 +1,26 @@
+import { InternalError } from "../errors"
+import { Net } from "./Net"
+import { netCleanUpWires } from "./netCleanUpWires"
+import { netCloseFreePorts } from "./netCloseFreePorts"
+import { netReleaseFreePorts } from "./netReleaseFreePorts"
+
+export function netRun(net: Net): void {
+  const closer = netCloseFreePorts(net)
+
+  while (net.actions.length > 0) {
+    netStep(net)
+  }
+
+  netCleanUpWires(net)
+  netReleaseFreePorts(net, closer)
+}
+
+function netStep(net: Net): void {
+  if (net.portStack.length !== 0) {
+    throw new InternalError("I can not handle free port during stepping.")
+  }
+
+  const action = net.actions.pop()
+  if (action === undefined) return
+  else action.act(net.mod, net)
+}