ambr netConnect netConnectPorts

TODO.md

@@ -1,5 +1,3 @@
-[maybe] quit using `ActiveEdge`
-
 use new syntax
 
 `Node` with optionally named port
@@ -12,6 +10,8 @@ use new syntax
 
 change the `render` command to simple `run` command
 
+[maybe] quit using `ActiveEdge`
+
 # the paper
 
 phase space and monoid -- understand the model theory of linear logic

src/lang/definitions/NodeDefinition.ts

@@ -1,6 +1,6 @@
 import { Definition } from "../definition"
 import { Net, Node, createNode } from "../graph"
-import { netConnect } from "../graph/netConnect"
+import { netConnectPorts } from "../graph/netConnectPorts"
 import { Mod } from "../mod"
 import { Type } from "../type"
 
@@ -31,7 +31,7 @@ export class NodeDefinition implements Definition {
         throw new Error(`I expect a port on top of the stack`)
       }
 
-      netConnect(net, top, port)
+      netConnectPorts(net, top, port)
     }
 
     net.portStack.push(...node.output)

src/lang/graph/interact.ts

@@ -1,7 +1,7 @@
 import { InternalError } from "../errors"
 import { ActiveEdge, Net, Node, Port } from "../graph"
 import { Mod } from "../mod"
-import { netConnect } from "./netConnect"
+import { netConnectPorts } from "./netConnectPorts"
 import { netRemoveEdge } from "./netRemoveEdge"
 import { netRemoveNode } from "./netRemoveNode"
 
@@ -86,6 +86,6 @@ function reconnectOutput(net: Net, output: Array<Port>): void {
   while (net.portStack.length > 0) {
     const start = net.portStack.pop() as Port
     const end = output.pop() as Port
-    netConnect(net, start, end)
+    netConnectPorts(net, start, end)
   }
 }

src/lang/graph/netCleanUpWires.ts

@@ -1,5 +1,5 @@
 import { Net } from "./Net"
-import { netConnect } from "./netConnect"
+import { netConnectPorts } from "./netConnectPorts"
 import { netRemoveEdge } from "./netRemoveEdge"
 import { netRemoveNode } from "./netRemoveNode"
 
@@ -12,7 +12,7 @@ export function netCleanUpWires(net: Net): void {
       netRemoveNode(net, wire.start.node)
       netRemoveNode(net, wire.end.node)
 
-      netConnect(net, wire.start.connection.port, wire.end.connection.port)
+      netConnectPorts(net, wire.start.connection.port, wire.end.connection.port)
     }
   }
 

src/lang/graph/netConnect.ts → src/lang/graph/netConnectPorts.ts

@@ -1,8 +1,8 @@
-import { Net, Port, createEdge } from "../graph"
+import { Net, Port, createEdge } from "."
 import { lookupRuleByPorts } from "../mod/lookupRuleByPorts"
 import { createActiveEdge } from "./createActiveEdge"
 
-export function netConnect(net: Net, start: Port, end: Port): void {
+export function netConnectPorts(net: Net, start: Port, end: Port): void {
   const rule = lookupRuleByPorts(net.mod, start, end)
 
   if (rule) {

src/lang/mod/defineBuiltInOperators.ts

@@ -1,5 +1,5 @@
 import { Port, createNode } from "../graph"
-import { netConnect } from "../graph/netConnect"
+import { netConnectPorts } from "../graph/netConnectPorts"
 import { Mod } from "../mod"
 import { createTrivialTypes } from "../type"
 import { defineOperator } from "./defineOperator"
@@ -21,7 +21,7 @@ export function defineBuiltInOperators(mod: Mod): void {
   defineOperator(mod, "connect", (net) => {
     const start = net.portStack.pop() as Port
     const end = net.portStack.pop() as Port
-    netConnect(net, start, end)
+    netConnectPorts(net, start, end)
   })
 
   defineOperator(mod, "wire", (net) => {