internal/core/eval: small cleanup of evaluation code

in preparation of rewrite of disjunction algorithm

Change-Id: I725062ec004198fbe4b2194ee2c612e2ae7186ea
Reviewed-on: https://cue-review.googlesource.com/c/cue/+/8046
Reviewed-by: CUE cueckoo <[email protected]>
Reviewed-by: Marcel van Lohuizen <[email protected]>

Author: mpvl

internal/core/eval/disjunct.go

@@ -131,8 +131,8 @@ func (n *nodeContext) addDisjunctionValue(env *adt.Environment, x *adt.Disjuncti
 func (n *nodeContext) updateResult(state adt.VertexStatus) (isFinal bool) {
 	n.postDisjunct(state)
 
-	x := n.node
 	if n.hasErr() {
+		x := n.node
 		err, ok := x.BaseValue.(*adt.Bottom)
 		if !ok {
 			err = n.getErr()
@@ -166,7 +166,7 @@ func (n *nodeContext) updateResult(state adt.VertexStatus) (isFinal bool) {
 	p := &result
 	d.Values = append(d.Values, p)
 
-	if n.done() && (!n.isDefault() || n.isDefault()) {
+	if n.done() {
 		n.nodeShared.isDone = true
 	}
 

internal/core/eval/eval.go

@@ -200,6 +200,7 @@ func (e *Evaluator) Evaluate(c *adt.OpContext, v *adt.Vertex) adt.Value {
 			clone := *(d.Values[last])
 			d.Values[last] = &clone
 
+			v.UpdateStatus(adt.Finalized)
 			v.BaseValue = d
 			v.Arcs = nil
 			v.Structs = nil // TODO: maybe not do this.
@@ -344,7 +345,6 @@ func (e *Evaluator) evalVertex(c *adt.OpContext, v *adt.Vertex, state adt.Vertex
 			// conflicts at the appropriate place, to allow valid fields to
 			// be represented normally and, most importantly, to avoid
 			// recursive processing of a disallowed field.
-			v.BaseValue = err
 			v.SetValue(c, adt.Finalized, err)
 			return shared
 		}
@@ -684,7 +684,8 @@ func (n *nodeShared) createDisjunct() *adt.Disjunction {
 }
 
 func (n *nodeShared) result() *adt.Vertex {
-	return &n.result_
+	x := n.result_
+	return &x
 }
 
 func (n *nodeShared) setResult(v *adt.Vertex) {