capNodeAllPorts vs capNodeNonPrinciplePorts

src/lang/cap/capNodeAllPorts.ts

@@ -0,0 +1,17 @@
+import { Mod } from "../mod"
+import { Net } from "../net"
+import { findInputPorts } from "../net/findInputPorts"
+import { findOutputPorts } from "../net/findOutputPorts"
+import { Node } from "../node"
+import { capInputPort } from "./capInputPort"
+import { capOutputPort } from "./capOutputPort"
+
+export function capNodeAllPorts(mod: Mod, net: Net, node: Node): void {
+  for (const port of findInputPorts(net, node)) {
+    capInputPort(mod, net, port)
+  }
+
+  for (const port of findOutputPorts(net, node)) {
+    capOutputPort(mod, net, port)
+  }
+}

src/lang/cap/capNode.ts → src/lang/cap/capNodeNonPrinciplePorts.ts

@@ -6,7 +6,7 @@ import { Node } from "../node"
 import { capInputPort } from "./capInputPort"
 import { capOutputPort } from "./capOutputPort"
 
-export function capNode(mod: Mod, net: Net, node: Node): void {
+export function capNodeNonPrinciplePorts(mod: Mod, net: Net, node: Node): void {
   for (const port of findInputPorts(net, node)) {
     if (!port.isPrincipal) {
       capInputPort(mod, net, port)

src/lang/cap/index.ts

@@ -1,4 +1,5 @@
 export * from "./capInputPort"
-export * from "./capNode"
+export * from "./capNodeAllPorts"
+export * from "./capNodeNonPrinciplePorts"
 export * from "./capOutputPort"
 export * from "./capType"

src/lang/check/checkRule.ts

@@ -1,4 +1,4 @@
-import { capNode } from "../cap/capNode"
+import { capNodeNonPrinciplePorts } from "../cap/capNodeNonPrinciplePorts"
 import { createChecking } from "../checking/createChecking"
 import { compose } from "../compose/compose"
 import { createEnv } from "../env/createEnv"
@@ -33,8 +33,8 @@ export function checkRule(
 
   refreshNode(env.net, checking.typeVarCounters, second)
 
-  capNode(mod, env.net, first)
-  capNode(mod, env.net, second)
+  capNodeNonPrinciplePorts(mod, env.net, first)
+  capNodeNonPrinciplePorts(mod, env.net, second)
 
   for (const word of words) {
     compose(mod, env, word, {

src/lang/present/presentNodeAsNet.test.ts

@@ -25,7 +25,8 @@ end
   const net = presentNodeAsNet(mod, "add")
 
   expect(formatNet(net)).toMatchInlineSnapshot(`
-    "(add₀)-addend covering-(@input_port_cap₀)
+    "(add₀)-target covering-(@input_port_cap₀)
+    (add₀)-addend covering-(@input_port_cap₁)
     (add₀)-return covering-(@ouput_port_cap₀)"
   `)
 })

src/lang/present/presentNodeAsNet.ts

@@ -1,4 +1,4 @@
-import { capNode } from "../cap"
+import { capNodeAllPorts } from "../cap"
 import { Mod, lookupDefinitionOrFail } from "../mod"
 import { Net, createNet } from "../net"
 import { createNodeFromDefinition } from "../node/createNodeFromDefinition"
@@ -8,7 +8,7 @@ export function presentNodeAsNet(mod: Mod, nodeName: string): Net {
 
   const definition = lookupDefinitionOrFail(mod, nodeName)
   const node = createNodeFromDefinition(net, definition)
-  capNode(mod, net, node)
+  capNodeAllPorts(mod, net, node)
 
   return net
 }

src/lang/present/presentRuleAsNets.ts

@@ -1,12 +1,11 @@
-import { capNode } from "../cap"
+import { capNodeNonPrinciplePorts } from "../cap"
 import { compose } from "../compose/compose"
 import { connect } from "../connect/connect"
 import { createEnv } from "../env/createEnv"
 import { Mod, lookupDefinitionOrFail } from "../mod"
 import { lookupRuleByName } from "../mod/lookupRuleByName"
 import { Net, copyConnectedComponent, createNet } from "../net"
 import { deleteNodeEntry } from "../net/deleteNodeEntry"
-import { disconnectPort } from "../net/disconnectPort"
 import { findPrincipalPort } from "../net/findPrincipalPort"
 import { Node } from "../node"
 import { createNodeFromDefinition } from "../node/createNodeFromDefinition"
@@ -37,8 +36,8 @@ export function presentRuleAsNets(mod: Mod, ruleName: string): [Net, Net] {
     lookupDefinitionOrFail(mod, secondName),
   )
 
-  capNode(mod, env.net, first)
-  capNode(mod, env.net, second)
+  capNodeNonPrinciplePorts(mod, env.net, first)
+  capNodeNonPrinciplePorts(mod, env.net, second)
 
   const initial = collectInitialNet(env.net, first, second)
 
@@ -63,16 +62,7 @@ function collectInitialNet(net: Net, first: Node, second: Node): Net {
   copyConnectedComponent(net, initial, second)
 
   const firstPrincipalPort = findPrincipalPort(initial, first)
-  const firstConnectedPort = disconnectPort(initial, firstPrincipalPort)
-  if (firstConnectedPort) {
-    deleteNodeEntry(initial, firstConnectedPort.node)
-  }
-
   const secondPrincipalPort = findPrincipalPort(initial, second)
-  const secondConnectedPort = disconnectPort(initial, secondPrincipalPort)
-  if (secondConnectedPort) {
-    deleteNodeEntry(initial, secondConnectedPort.node)
-  }
 
   connect(initial, firstPrincipalPort, secondPrincipalPort)