ambr createNodeFromDefinition addNodeFromDefinition

cicada-lang · Nov 15, 2023 · ac9bb54 · ac9bb54
1 parent 8caa0dc
commit ac9bb54
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 15 deletions.
diff --git a/src/lang/check/checkRule.ts b/src/lang/check/checkRule.ts
@@ -6,7 +6,7 @@ import { BlockStmt } from "../exp/BlockStmt"
 import { refreshNode } from "../freshen/refreshNode"
 import { Mod } from "../mod"
 import { findDefinitionOrFail } from "../mod/findDefinitionOrFail"
-import { createNodeFromDefinition } from "../node/createNodeFromDefinition"
+import { addNodeFromDefinition } from "../node/addNodeFromDefinition"
 import { RuleTarget } from "../rule"
 import { exposeRuleTargets } from "../rule/exposeRuleTargets"
 import { checkAllLocalsAreUsed } from "./checkAllLocalsAreUsed"
@@ -20,14 +20,14 @@ export function checkRule(
   const checking = createChecking()
   const env = createEnv(mod)
 
-  const firstNode = createNodeFromDefinition(
+  const firstNode = addNodeFromDefinition(
     env.net,
     findDefinitionOrFail(mod, first.name),
   )
 
   refreshNode(env.net, checking.typeVarCounters, firstNode)
 
-  const secondNode = createNodeFromDefinition(
+  const secondNode = addNodeFromDefinition(
     env.net,
     findDefinitionOrFail(mod, second.name),
   )

diff --git a/src/lang/evaluate/evaluateDefinition.ts b/src/lang/evaluate/evaluateDefinition.ts
@@ -1,6 +1,6 @@
 import { Definition } from "../definition"
 import { Env } from "../env"
-import { createNodeFromDefinition } from "../node/createNodeFromDefinition"
+import { addNodeFromDefinition } from "../node/addNodeFromDefinition"
 import { Value } from "../value"
 import { EvaluateOptions } from "./evaluate"
 
@@ -11,7 +11,7 @@ export function evaluateDefinition(
 ): Value {
   switch (definition["@kind"]) {
     case "NodeDefinition": {
-      return createNodeFromDefinition(env.net, definition)
+      return addNodeFromDefinition(env.net, definition)
     }
 
     case "TypeDefinition": {

diff --git a/src/lang/node/createNodeFromDefinition.ts → src/lang/node/addNodeFromDefinition.ts b/src/lang/node/createNodeFromDefinition.ts → src/lang/node/addNodeFromDefinition.ts
@@ -3,14 +3,11 @@ import { Net } from "../net"
 import { addNode } from "../net/addNode"
 import { Node } from "../node"
 
-export function createNodeFromDefinition(
-  net: Net,
-  definition: Definition,
-): Node {
+export function addNodeFromDefinition(net: Net, definition: Definition): Node {
   if (definition["@kind"] !== "NodeDefinition") {
     throw new Error(
       [
-        `[createNodeFromDefinition] I expect the definition to be NodeDefinition.`,
+        `[addNodeFromDefinition] I expect the definition to be NodeDefinition.`,
         ``,
         `  definition kind: ${definition["@kind"]}`,
       ].join("\n"),

diff --git a/src/lang/present/presentNode.ts b/src/lang/present/presentNode.ts
@@ -1,13 +1,13 @@
 import { capNodeAllPorts } from "../cap"
 import { Mod, findDefinitionOrFail } from "../mod"
 import { Net, createNet } from "../net"
-import { createNodeFromDefinition } from "../node/createNodeFromDefinition"
+import { addNodeFromDefinition } from "../node/addNodeFromDefinition"
 
 export function presentNode(mod: Mod, nodeName: string): Net {
   const net = createNet()
 
   const definition = findDefinitionOrFail(mod, nodeName)
-  const node = createNodeFromDefinition(net, definition)
+  const node = addNodeFromDefinition(net, definition)
   capNodeAllPorts(mod, net, node)
 
   return net

diff --git a/src/lang/present/presentRule.ts b/src/lang/present/presentRule.ts
@@ -9,7 +9,7 @@ import { deleteNodeEntry } from "../net/deleteNodeEntry"
 import { disconnectPort } from "../net/disconnectPort"
 import { findPrincipalPort } from "../net/findPrincipalPort"
 import { Node } from "../node"
-import { createNodeFromDefinition } from "../node/createNodeFromDefinition"
+import { addNodeFromDefinition } from "../node/addNodeFromDefinition"
 import { exposeRuleTargets } from "../rule/exposeRuleTargets"
 
 export function presentRule(mod: Mod, ruleName: string): [Net, Net] {
@@ -28,12 +28,12 @@ export function presentRule(mod: Mod, ruleName: string): [Net, Net] {
 
   const [firstName, secondName] = ruleName.split(" ")
 
-  const firstNode = createNodeFromDefinition(
+  const firstNode = addNodeFromDefinition(
     env.net,
     findDefinitionOrFail(mod, firstName),
   )
 
-  const secondNode = createNodeFromDefinition(
+  const secondNode = addNodeFromDefinition(
     env.net,
     findDefinitionOrFail(mod, secondName),
   )