this repo has no description
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 <mpvl@gmail.com>
Change-Id: I5b51752218882bb1d4a7d1edc06196268f130535
Reviewed-on: https://review.gerrithub.io/c/cue-lang/cue/+/1167911
Reviewed-by: Daniel Martí <mvdan@mvdan.cc>
TryBot-Result: CUEcueckoo <cueckoo@cuelang.org>
Unity-Result: CUE porcuepine <cue.porcuepine@gmail.com>
+14
-14
+8
-8
internal/core/adt/comprehension.go
+8
-8
internal/core/adt/comprehension.go
···
72
72
73
73
// envComprehension caches the result of a single comprehension.
74
74
type envComprehension struct {
75
-
comp *Comprehension
76
-
node *Vertex // The Vertex from which the comprehension originates.
75
+
comp *Comprehension
76
+
vertex *Vertex // The Vertex from which the comprehension originates.
77
77
78
78
// runtime-related fields
79
79
···
141
141
ec := c.comp
142
142
if ec == nil {
143
143
ec = &envComprehension{
144
-
comp: c,
145
-
node: n.node,
144
+
comp: c,
145
+
vertex: n.node,
146
146
147
147
err: nil, // shut up linter
148
148
envs: nil, // shut up linter
···
391
391
envs = append(envs, env)
392
392
}
393
393
394
-
if err := ctx.yield(d.node, d.env, d.comp, state, f); err != nil {
394
+
if err := ctx.yield(d.vertex, d.env, d.comp, state, f); err != nil {
395
395
if err.IsIncomplete() {
396
396
return err
397
397
}
···
399
399
// continue to collect other errors.
400
400
d.done = true
401
401
d.inserted = true
402
-
if d.node != nil {
403
-
d.node.state.addBottom(err)
404
-
ctx.PopArc(d.node)
402
+
if d.vertex != nil {
403
+
d.vertex.state.addBottom(err)
404
+
ctx.PopArc(d.vertex)
405
405
}
406
406
return nil
407
407
}
+6
-6
internal/core/adt/eval.go
+6
-6
internal/core/adt/eval.go
···
669
669
// }
670
670
// n := d.node.getNodeContext(ctx)
671
671
// n.addBottom(err)
672
-
if final && c.node != nil && c.node.status != finalized {
673
-
n := c.node.getNodeContext(n.ctx, 0)
672
+
if final && c.vertex != nil && c.vertex.status != finalized {
673
+
n := c.vertex.getNodeContext(n.ctx, 0)
674
674
n.addBottom(err)
675
-
c.node = nil
675
+
c.vertex = nil
676
676
}
677
677
}
678
678
for _, c := range n.selfComprehensions {
···
698
698
// }
699
699
// n := d.node.getNodeContext(ctx)
700
700
// n.addBottom(err)
701
-
if c.node != nil && c.node.status != finalized {
702
-
n := c.node.getNodeContext(n.ctx, 0)
701
+
if c.vertex != nil && c.vertex.status != finalized {
702
+
n := c.vertex.getNodeContext(n.ctx, 0)
703
703
n.addBottom(err)
704
-
c.node = nil
704
+
c.vertex = nil
705
705
}
706
706
}
707
707
for _, x := range n.exprs {