rename Net to Env

TODO.md

@@ -1,13 +1,8 @@
-`rule` check node order
-
-- The first node must have its principal port in the output,
-  and the second node must have its principal port in the input.
-
 # value
 
-rename `Net` to `Env`
+`Value`
 
-rename `Env.ports` to `Env.stack`
+rename `Env.ports` to `Env.values`
 
 merge `Ctx` to `Env`
 
@@ -19,6 +14,13 @@ the stack can take other types of values -- not only port
 
 `value :key` should be of type `Labeled("key", 'a)`
 
+# check
+
+`rule` check node order
+
+- The first node must have its principal port in the output,
+  and the second node must have its principal port in the input.
+
 # module
 
 design module system

src/lang/builtins/connect.ts

@@ -1,11 +1,11 @@
 import { Ctx } from "../ctx"
+import { Env } from "../env"
+import { connect } from "../env/connect"
 import { Port } from "../graph"
-import { Net } from "../net"
-import { connect } from "../net/connect"
 import { SignedType } from "../type"
 import { unifySignedTypes } from "../unify/unifySignedTypes"
 
-export function compose(net: Net): void {
+export function compose(net: Env): void {
   const start = net.ports.pop() as Port
   const end = net.ports.pop() as Port
   connect(net, start, end)

src/lang/builtins/rot.ts

@@ -1,9 +1,9 @@
 import { Ctx } from "../ctx"
+import { Env } from "../env"
 import { Port } from "../graph"
-import { Net } from "../net"
 import { SignedType } from "../type"
 
-export function compose(net: Net): void {
+export function compose(net: Env): void {
   const x2 = net.ports.pop() as Port
   const x1 = net.ports.pop() as Port
   const x0 = net.ports.pop() as Port

src/lang/builtins/swap.ts

@@ -1,9 +1,9 @@
 import { Ctx } from "../ctx"
+import { Env } from "../env"
 import { Port } from "../graph"
-import { Net } from "../net"
 import { SignedType } from "../type"
 
-export function compose(net: Net): void {
+export function compose(net: Env): void {
   const x1 = net.ports.pop() as Port
   const x0 = net.ports.pop() as Port
   net.ports.push(x1, x0)

src/lang/builtins/wire.ts

@@ -1,15 +1,15 @@
 import { Ctx } from "../ctx"
+import { Env } from "../env"
 import { createNode } from "../graph/createNode"
 import { Mod } from "../mod"
-import { Net } from "../net"
 import * as Types from "../type"
 import { Sign } from "../type"
 import { freshenType } from "../unify/freshenType"
 
 let wireCounter = 0
 
 export default function (mod: Mod) {
-  function compose(net: Net): void {
+  function compose(net: Env): void {
     const node = createNode(
       mod,
       "wire",

src/lang/compose/compose.ts

@@ -1,9 +1,9 @@
+import { Env } from "../env"
+import { connect } from "../env/connect"
+import { disconnect } from "../env/disconnect"
 import { Node } from "../graph"
 import { Mod } from "../mod"
 import { lookupDefinitionOrFail } from "../mod/lookupDefinitionOrFail"
-import { Net } from "../net"
-import { connect } from "../net/connect"
-import { disconnect } from "../net/disconnect"
 import { Word } from "../word"
 import { composeDefinition } from "./composeDefinition"
 import { findCurrentPortOrFail } from "./findCurrentPortOrFail"
@@ -14,7 +14,7 @@ export interface ComposeOptions {
 
 export function compose(
   mod: Mod,
-  net: Net,
+  net: Env,
   word: Word,
   options: ComposeOptions,
 ): void {

src/lang/compose/composeDefinition.ts

@@ -1,11 +1,11 @@
 import { Definition } from "../definition"
-import { Net } from "../net"
+import { Env } from "../env"
 import { ComposeOptions } from "./compose"
 import { composeNodeDefinition } from "./composeNodeDefinition"
 import { composeWords } from "./composeWords"
 
 export function composeDefinition(
-  net: Net,
+  net: Env,
   definition: Definition,
   options: ComposeOptions,
 ): void {

src/lang/compose/composeNode.ts

@@ -1,8 +1,8 @@
+import { Env } from "../env"
+import { connect } from "../env/connect"
 import { Node } from "../graph"
-import { Net } from "../net"
-import { connect } from "../net/connect"
 
-export function composeNode(net: Net, node: Node): Node {
+export function composeNode(net: Env, node: Node): Node {
   // Be careful about the order:
   // The first input port connects
   // with the port on the top of the stack.

src/lang/compose/composeNodeDefinition.ts

@@ -1,11 +1,11 @@
 import { NodeDefinition } from "../definition"
+import { Env } from "../env"
 import { Node } from "../graph"
 import { createNode } from "../graph/createNode"
-import { Net } from "../net"
 import { composeNode } from "./composeNode"
 
 export function composeNodeDefinition(
-  net: Net,
+  net: Env,
   definition: NodeDefinition,
 ): Node {
   const node = createNode(

src/lang/compose/composeWords.ts

@@ -1,12 +1,12 @@
+import { Env } from "../env"
+import { cleanUpWires } from "../env/cleanUpWires"
 import { Mod } from "../mod"
-import { Net } from "../net"
-import { cleanUpWires } from "../net/cleanUpWires"
 import { Word } from "../word"
 import { ComposeOptions, compose } from "./compose"
 
 export function composeWords(
   mod: Mod,
-  net: Net,
+  net: Env,
   words: Array<Word>,
   options: ComposeOptions,
 ): void {

src/lang/definition/Definition.ts

@@ -1,7 +1,7 @@
 import { Ctx } from "../ctx"
+import { Env } from "../env"
 import { PortExp } from "../graph/PortExp"
 import { Mod } from "../mod"
-import { Net } from "../net"
 import { Span } from "../span"
 import { SignedType } from "../type"
 import { Word } from "../word"
@@ -69,14 +69,14 @@ export type OperatorDefinition = {
   kind: "OperatorDefinition"
   mod: Mod
   name: string
-  compose: (net: Net) => void
+  compose: (net: Env) => void
   cut: (ctx: Ctx) => void
 }
 
 export function OperatorDefinition(
   mod: Mod,
   name: string,
-  compose: (net: Net) => void,
+  compose: (net: Env) => void,
   cut: (ctx: Ctx) => void,
 ): OperatorDefinition {
   return {

src/lang/net/Net.ts → src/lang/env/Env.ts

@@ -1,7 +1,7 @@
 import { ActiveEdge, Edge, Node, Port } from "../graph"
 import { Mod } from "../mod"
 
-export type Net = {
+export type Env = {
   mod: Mod
   nodes: Array<Node>
   edges: Array<Edge>

src/lang/net/cleanUpWires.ts → src/lang/env/cleanUpWires.ts

@@ -1,9 +1,9 @@
-import { Net } from "./Net"
+import { Env } from "./Env"
 import { connect } from "./connect"
 import { disconnect } from "./disconnect"
 import { removeNode } from "./removeNode"
 
-export function cleanUpWires(net: Net): void {
+export function cleanUpWires(net: Env): void {
   for (const wire of net.wires) {
     if (wire.start.connection && wire.end.connection) {
       removeNode(net, wire.start.node)

src/lang/net/connect.ts → src/lang/env/connect.ts

@@ -1,8 +1,8 @@
+import { Env } from "../env"
 import { Port } from "../graph/Port"
 import { lookupRuleByPorts } from "../mod/lookupRuleByPorts"
-import { Net } from "../net"
 
-export function connect(net: Net, start: Port, end: Port): void {
+export function connect(net: Env, start: Port, end: Port): void {
   const rule = lookupRuleByPorts(net.mod, start, end)
 
   if (start.connection !== undefined) {

src/lang/net/createNet.ts → src/lang/env/createEnv.ts

@@ -1,7 +1,7 @@
+import { Env } from "../env"
 import { Mod } from "../mod"
-import { Net } from "../net"
 
-export function createNet(mod: Mod): Net {
+export function createEnv(mod: Mod): Env {
   return {
     mod,
     nodes: [],

src/lang/net/disconnect.ts → src/lang/env/disconnect.ts

@@ -1,8 +1,8 @@
+import { Env } from "../env"
 import { Edge } from "../graph/Edge"
-import { Net } from "../net"
 import { removeEdge } from "./removeEdge"
 
-export function disconnect(net: Net, edge: Edge): void {
+export function disconnect(net: Env, edge: Edge): void {
   removeEdge(net, edge)
 
   // Be careful about memory leak.

src/lang/net/formatNet.ts → src/lang/env/formatEnv.ts

@@ -1,7 +1,7 @@
+import { Env } from "../env"
 import { formatNode } from "../graph/formatNode"
-import { Net } from "../net"
 
-export function formatNet(net: Net): string {
+export function formatEnv(net: Env): string {
   const lines: Array<string> = []
 
   for (const edge of [...net.activeEdges].reverse()) {

src/lang/env/index.ts

@@ -0,0 +1 @@
+export * from "./Env"

src/lang/net/removeEdge.ts → src/lang/env/removeEdge.ts

@@ -1,7 +1,7 @@
+import { Env } from "../env"
 import { Edge } from "../graph/Edge"
-import { Net } from "../net"
 
-export function removeEdge(net: Net, edge: Edge): void {
+export function removeEdge(net: Env, edge: Edge): void {
   const index = net.edges.indexOf(edge)
   if (index !== -1) {
     net.edges.splice(index, 1)

src/lang/net/removeNode.ts → src/lang/env/removeNode.ts

@@ -1,7 +1,7 @@
+import { Env } from "../env"
 import { Node } from "../graph/Node"
-import { Net } from "../net"
 
-export function removeNode(net: Net, node: Node): void {
+export function removeNode(net: Env, node: Node): void {
   const index = net.nodes.indexOf(node)
   if (index !== -1) {
     net.nodes.splice(index, 1)

src/lang/net/removeNodeAndEdges.ts → src/lang/env/removeNodeAndEdges.ts

@@ -1,9 +1,9 @@
 import { Node } from "../graph"
-import { Net } from "./Net"
+import { Env } from "./Env"
 import { removeEdge } from "./removeEdge"
 import { removeNode } from "./removeNode"
 
-export function removeNodeAndEdges(net: Net, node: Node): void {
+export function removeNodeAndEdges(net: Env, node: Node): void {
   removeNode(net, node)
 
   for (const port of node.input) {

src/lang/mod/defineOperator.ts

@@ -1,14 +1,14 @@
 import { Ctx } from "../ctx"
 import * as Definitions from "../definition"
-import { Net } from "../net"
+import { Env } from "../env"
 import { Mod } from "./Mod"
 import { define } from "./define"
 
 export function defineOperator(
   mod: Mod,
   name: string,
   options: {
-    compose: (net: Net) => void
+    compose: (net: Env) => void
     cut: (ctx: Ctx) => void
   },
 ): void {

src/lang/run/closeFreePorts.ts

@@ -1,7 +1,7 @@
 import { composeNode } from "../compose/composeNode"
+import { Env } from "../env"
 import { Node } from "../graph/Node"
 import { createNode } from "../graph/createNode"
-import { Net } from "../net"
 
 /*
 
@@ -10,7 +10,7 @@ import { Net } from "../net"
 
 */
 
-export function closeFreePorts(net: Net): Node | undefined {
+export function closeFreePorts(net: Env): Node | undefined {
   if (net.ports.length === 0) {
     return undefined
   }

src/lang/run/interact.ts

@@ -1,10 +1,10 @@
 import { compose } from "../compose/compose"
+import { Env } from "../env"
+import { removeNodeAndEdges } from "../env/removeNodeAndEdges"
 import { ActiveEdge } from "../graph"
 import { Mod } from "../mod"
-import { Net } from "../net"
-import { removeNodeAndEdges } from "../net/removeNodeAndEdges"
 
-export function interact(mod: Mod, net: Net, activeEdge: ActiveEdge): void {
+export function interact(mod: Mod, net: Env, activeEdge: ActiveEdge): void {
   removeNodeAndEdges(net, activeEdge.end.node)
   removeNodeAndEdges(net, activeEdge.start.node)
 

src/lang/run/releaseFreePorts.ts

@@ -1,9 +1,9 @@
+import { Env } from "../env"
+import { disconnect } from "../env/disconnect"
+import { removeNode } from "../env/removeNode"
 import { Node } from "../graph/Node"
-import { Net } from "../net"
-import { disconnect } from "../net/disconnect"
-import { removeNode } from "../net/removeNode"
 
-export function releaseFreePorts(net: Net, closer: Node | undefined): void {
+export function releaseFreePorts(net: Env, closer: Node | undefined): void {
   if (closer === undefined) {
     return
   }

src/lang/run/run.ts

@@ -1,10 +1,10 @@
-import { Net } from "../net"
-import { cleanUpWires } from "../net/cleanUpWires"
+import { Env } from "../env"
+import { cleanUpWires } from "../env/cleanUpWires"
 import { closeFreePorts } from "./closeFreePorts"
 import { interact } from "./interact"
 import { releaseFreePorts } from "./releaseFreePorts"
 
-export function run(net: Net): void {
+export function run(net: Env): void {
   const closer = closeFreePorts(net)
 
   while (net.activeEdges.length > 0) {
@@ -16,7 +16,7 @@ export function run(net: Net): void {
   releaseFreePorts(net, closer)
 }
 
-function step(net: Net): void {
+function step(net: Env): void {
   const activeEdge = net.activeEdges.pop()
   if (activeEdge !== undefined) {
     interact(net.mod, net, activeEdge)