internal/core/adt: rename node to vertex

This allows introducing a node method, needed to
satisfy an upcoming interface.

Signed-off-by: Marcel van Lohuizen <[email protected]>
Change-Id: I5b51752218882bb1d4a7d1edc06196268f130535
Reviewed-on: https://review.gerrithub.io/c/cue-lang/cue/+/1167911
Reviewed-by: Daniel Martí <[email protected]>
TryBot-Result: CUEcueckoo <[email protected]>
Unity-Result: CUE porcuepine <[email protected]>

Author: mpvl

internal/core/adt/comprehension.go

@@ -72,8 +72,8 @@ package adt
 
 // envComprehension caches the result of a single comprehension.
 type envComprehension struct {
-	comp *Comprehension
-	node *Vertex // The Vertex from which the comprehension originates.
+	comp   *Comprehension
+	vertex *Vertex // The Vertex from which the comprehension originates.
 
 	// runtime-related fields
 
@@ -141,8 +141,8 @@ func (n *nodeContext) insertComprehension(
 	ec := c.comp
 	if ec == nil {
 		ec = &envComprehension{
-			comp: c,
-			node: n.node,
+			comp:   c,
+			vertex: n.node,
 
 			err:  nil,   // shut up linter
 			envs: nil,   // shut up linter
@@ -391,17 +391,17 @@ func (n *nodeContext) processComprehension(d *envYield, state vertexStatus) *Bot
 			envs = append(envs, env)
 		}
 
-		if err := ctx.yield(d.node, d.env, d.comp, state, f); err != nil {
+		if err := ctx.yield(d.vertex, d.env, d.comp, state, f); err != nil {
 			if err.IsIncomplete() {
 				return err
 			}
 
 			// continue to collect other errors.
 			d.done = true
 			d.inserted = true
-			if d.node != nil {
-				d.node.state.addBottom(err)
-				ctx.PopArc(d.node)
+			if d.vertex != nil {
+				d.vertex.state.addBottom(err)
+				ctx.PopArc(d.vertex)
 			}
 			return nil
 		}

internal/core/adt/eval.go

@@ -669,10 +669,10 @@ func (n *nodeContext) incompleteErrors(final bool) *Bottom {
 		// }
 		// n := d.node.getNodeContext(ctx)
 		// n.addBottom(err)
-		if final && c.node != nil && c.node.status != finalized {
-			n := c.node.getNodeContext(n.ctx, 0)
+		if final && c.vertex != nil && c.vertex.status != finalized {
+			n := c.vertex.getNodeContext(n.ctx, 0)
 			n.addBottom(err)
-			c.node = nil
+			c.vertex = nil
 		}
 	}
 	for _, c := range n.selfComprehensions {
@@ -698,10 +698,10 @@ func (n *nodeContext) incompleteErrors(final bool) *Bottom {
 		// }
 		// n := d.node.getNodeContext(ctx)
 		// n.addBottom(err)
-		if c.node != nil && c.node.status != finalized {
-			n := c.node.getNodeContext(n.ctx, 0)
+		if c.vertex != nil && c.vertex.status != finalized {
+			n := c.vertex.getNodeContext(n.ctx, 0)
 			n.addBottom(err)
-			c.node = nil
+			c.vertex = nil
 		}
 	}
 	for _, x := range n.exprs {