internal/core/adt: automatic renaming

This is the last step to make List- and StructMarker
a type different from Value and Expr.

Rename:
Vertex.Value -> Vertex.BaseValue
Vertex.ActualValue() -> Vertex.Value()

This generated changes should be used as a last
manual check that the values are used correctly.

Issue #598

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

Author: mpvl

cue/context.go

@@ -76,7 +76,7 @@ func (v Value) eval(ctx *context) adt.Value {
 		panic("undefined value")
 	}
 	x := ctx.manifest(v.v)
-	return x.ActualValue()
+	return x.Value()
 }
 
 // func (v Value) evalFull(u value) (Value, adt.Value) {

cue/load/config.go

@@ -536,12 +536,12 @@ func (c Config) complete() (cfg *Config, err error) {
 		v.Finalize(ctx)
 		prefix := v.Lookup(ctx.StringLabel("module"))
 		if prefix != nil {
-			name := ctx.StringValue(prefix.ActualValue())
+			name := ctx.StringValue(prefix.Value())
 			if err := ctx.Err(); err != nil {
 				return &c, err.Err
 			}
 			pos := token.NoPos
-			src := prefix.ActualValue().Source()
+			src := prefix.Value().Source()
 			if src != nil {
 				pos = src.Pos()
 			}

cue/types.go

@@ -565,7 +565,7 @@ type Value struct {
 }
 
 func newErrValue(v Value, b *adt.Bottom) Value {
-	node := &adt.Vertex{Value: b}
+	node := &adt.Vertex{BaseValue: b}
 	if v.v != nil {
 		node.Label = v.v.Label
 		node.Parent = v.v.Parent
@@ -635,9 +635,9 @@ func MakeValue(ctx *adt.OpContext, v adt.Value) Value {
 }
 
 func makeValue(idx *index, v *adt.Vertex) Value {
-	if v.Status() == 0 || v.Value == nil {
+	if v.Status() == 0 || v.BaseValue == nil {
 		panic(fmt.Sprintf("not properly initialized (state: %v, value: %T)",
-			v.Status(), v.Value))
+			v.Status(), v.BaseValue))
 	}
 	return Value{idx, v}
 }
@@ -656,7 +656,7 @@ func remakeValue(base Value, env *adt.Environment, v adt.Expr) Value {
 }
 
 func remakeFinal(base Value, env *adt.Environment, v adt.Value) Value {
-	n := &adt.Vertex{Parent: base.v.Parent, Label: base.v.Label, Value: v}
+	n := &adt.Vertex{Parent: base.v.Parent, Label: base.v.Label, BaseValue: v}
 	n.UpdateStatus(adt.Finalized)
 	return makeValue(base.idx, n)
 }
@@ -843,7 +843,7 @@ func (v Value) Kind() Kind {
 	if v.v == nil {
 		return BottomKind
 	}
-	c := v.v.Value
+	c := v.v.BaseValue
 	if !v.v.IsConcrete() {
 		return BottomKind
 	}
@@ -1061,7 +1061,7 @@ func (v Value) Source() ast.Node {
 	if len(v.v.Conjuncts) == 1 {
 		return v.v.Conjuncts[0].Source()
 	}
-	return v.v.ActualValue().Source()
+	return v.v.Value().Source()
 }
 
 // Err returns the error represented by v or nil v is not an error.
@@ -1100,7 +1100,7 @@ func (v Value) IsConcrete() bool {
 	if v.v == nil {
 		return false // any is neither concrete, not a list or struct.
 	}
-	if b, ok := v.v.Value.(*adt.Bottom); ok {
+	if b, ok := v.v.BaseValue.(*adt.Bottom); ok {
 		return !b.IsIncomplete()
 	}
 	if !adt.IsConcrete(v.v) {
@@ -1125,7 +1125,7 @@ func (v Value) Exists() bool {
 	if v.v == nil {
 		return false
 	}
-	if err, ok := v.v.Value.(*adt.Bottom); ok {
+	if err, ok := v.v.BaseValue.(*adt.Bottom); ok {
 		return err.Code != codeNotExist
 	}
 	return true
@@ -2164,15 +2164,15 @@ func (v Value) Expr() (Op, []Value) {
 	var env *adt.Environment
 
 	if v.v.IsData() {
-		expr = v.v.ActualValue()
+		expr = v.v.Value()
 
 	} else {
 		switch len(v.v.Conjuncts) {
 		case 0:
-			if v.v.Value == nil {
+			if v.v.BaseValue == nil {
 				return NoOp, []Value{makeValue(v.idx, v.v)}
 			}
-			expr = v.v.ActualValue()
+			expr = v.v.Value()
 
 		case 1:
 			// the default case, processed below.

cue/types_test.go

@@ -2499,7 +2499,7 @@ func TestWalk(t *testing.T) {
 				case ListKind:
 					buf = append(buf, '[')
 				default:
-					if b, _ := v.v.Value.(*adt.Bottom); b != nil {
+					if b, _ := v.v.BaseValue.(*adt.Bottom); b != nil {
 						s := debugStr(v.ctx(), b)
 						buf = append(buf, fmt.Sprint(s, ",")...)
 						return true

internal/core/adt/adt.go

@@ -144,7 +144,7 @@ func Pos(n Node) token.Pos {
 
 func (x *Vertex) Concreteness() Concreteness {
 	// Depends on concreteness of value.
-	switch v := x.Value.(type) {
+	switch v := x.BaseValue.(type) {
 	case nil:
 		return Concrete // Should be indetermined.
 

internal/core/adt/composite.go

@@ -178,9 +178,9 @@ type Vertex struct {
 	// SelfCount is used for tracking self-references.
 	SelfCount int
 
-	// Value is the value associated with this vertex. For lists and structs
+	// BaseValue is the value associated with this vertex. For lists and structs
 	// this is a sentinel value indicating its kind.
-	Value BaseValue
+	BaseValue BaseValue
 
 	// ChildErrors is the collection of all errors of children.
 	ChildErrors *Bottom
@@ -249,25 +249,25 @@ func (v *Vertex) UpdateStatus(s VertexStatus) {
 	if v.status > s+1 {
 		panic(fmt.Sprintf("attempt to regress status from %d to %d", v.Status(), s))
 	}
-	if s == Finalized && v.Value == nil {
+	if s == Finalized && v.BaseValue == nil {
 		// panic("not finalized")
 	}
 	v.status = s
 }
 
-// ActualValue returns the Value of v without definitions if it is a scalar
+// Value returns the Value of v without definitions if it is a scalar
 // or itself otherwise.
-func (v *Vertex) ActualValue() Value {
+func (v *Vertex) Value() Value {
 	// TODO: rename to Value.
-	switch x := v.Value.(type) {
+	switch x := v.BaseValue.(type) {
 	case nil:
 		return nil
 	case *StructMarker, *ListMarker:
 		return v
 	case Value:
 		return x
 	default:
-		panic(fmt.Sprintf("unexpected type %T", v.Value))
+		panic(fmt.Sprintf("unexpected type %T", v.BaseValue))
 	}
 }
 
@@ -302,7 +302,7 @@ func (v *Vertex) ToDataAll() *Vertex {
 	}
 	w := *v
 
-	w.Value = toDataAll(w.Value)
+	w.BaseValue = toDataAll(w.BaseValue)
 	w.Arcs = arcs
 	w.isData = true
 	w.Conjuncts = make([]Conjunct, len(v.Conjuncts))
@@ -352,7 +352,7 @@ func toDataAll(v BaseValue) BaseValue {
 
 func (v *Vertex) IsErr() bool {
 	// if v.Status() > Evaluating {
-	if _, ok := v.Value.(*Bottom); ok {
+	if _, ok := v.BaseValue.(*Bottom); ok {
 		return true
 	}
 	// }
@@ -361,7 +361,7 @@ func (v *Vertex) IsErr() bool {
 
 func (v *Vertex) Err(c *OpContext, state VertexStatus) *Bottom {
 	c.Unify(c, v, state)
-	if b, ok := v.Value.(*Bottom); ok {
+	if b, ok := v.BaseValue.(*Bottom); ok {
 		return b
 	}
 	return nil
@@ -374,12 +374,12 @@ func (v *Vertex) Finalize(c *OpContext) {
 }
 
 func (v *Vertex) AddErr(ctx *OpContext, b *Bottom) {
-	v.Value = CombineErrors(nil, v.ActualValue(), b)
+	v.BaseValue = CombineErrors(nil, v.Value(), b)
 	v.UpdateStatus(Finalized)
 }
 
 func (v *Vertex) SetValue(ctx *OpContext, state VertexStatus, value BaseValue) *Bottom {
-	v.Value = value
+	v.BaseValue = value
 	v.UpdateStatus(state)
 	return nil
 }
@@ -391,8 +391,8 @@ func ToVertex(v Value) *Vertex {
 		return x
 	default:
 		n := &Vertex{
-			status: Finalized,
-			Value:  x,
+			status:    Finalized,
+			BaseValue: x,
 		}
 		n.AddConjunct(MakeRootConjunct(nil, v))
 		return n
@@ -406,7 +406,7 @@ func Unwrap(v Value) Value {
 	if !ok {
 		return v
 	}
-	return x.ActualValue()
+	return x.Value()
 }
 
 // Acceptor is a single interface that reports whether feature f is a valid
@@ -443,10 +443,10 @@ const (
 func (v *Vertex) Kind() Kind {
 	// This is possible when evaluating comprehensions. It is potentially
 	// not known at this time what the type is.
-	if v.Value == nil {
+	if v.BaseValue == nil {
 		return TopKind
 	}
-	return v.Value.Kind()
+	return v.BaseValue.Kind()
 }
 
 func (v *Vertex) OptionalTypes() OptionalType {
@@ -461,7 +461,7 @@ func (v *Vertex) OptionalTypes() OptionalType {
 }
 
 func (v *Vertex) IsClosed(ctx *OpContext) bool {
-	switch x := v.Value.(type) {
+	switch x := v.BaseValue.(type) {
 	case *ListMarker:
 		// TODO: use one mechanism.
 		if x.IsOpen {
@@ -505,7 +505,7 @@ func (v *Vertex) MatchAndInsert(ctx *OpContext, arc *Vertex) {
 }
 
 func (v *Vertex) IsList() bool {
-	_, ok := v.Value.(*ListMarker)
+	_, ok := v.BaseValue.(*ListMarker)
 	return ok
 }
 
@@ -547,7 +547,7 @@ func (v *Vertex) Source() ast.Node { return nil }
 
 // AddConjunct adds the given Conjuncts to v if it doesn't already exist.
 func (v *Vertex) AddConjunct(c Conjunct) *Bottom {
-	if v.Value != nil {
+	if v.BaseValue != nil {
 		// TODO: investigate why this happens at all. Removing it seems to
 		// change the order of fields in some cases.
 		//

internal/core/adt/context.go

@@ -372,7 +372,7 @@ func (c *OpContext) Resolve(env *Environment, r Resolver) (*Vertex, *Bottom) {
 	}
 
 	for {
-		x, ok := arc.Value.(*Vertex)
+		x, ok := arc.BaseValue.(*Vertex)
 		if !ok {
 			break
 		}
@@ -449,7 +449,7 @@ func (c *OpContext) getDefault(v Value, scalar bool) (result Value, ok bool) {
 
 	case *Vertex:
 		// TODO: return vertex if not disjunction.
-		switch t := x.Value.(type) {
+		switch t := x.BaseValue.(type) {
 		case *Disjunction:
 			d = t
 
@@ -460,7 +460,7 @@ func (c *OpContext) getDefault(v Value, scalar bool) (result Value, ok bool) {
 			if !scalar {
 				return x, true
 			}
-			return x.ActualValue(), true
+			return x.Value(), true
 		}
 
 	case *Disjunction:
@@ -551,7 +551,7 @@ func (c *OpContext) evalState(v Expr, state VertexStatus) (result Value) {
 		}
 		if isIncomplete(arc) {
 			if arc != nil {
-				return arc.ActualValue() // *Bottom
+				return arc.Value() // *Bottom
 			}
 			return nil
 		}
@@ -573,8 +573,8 @@ func (c *OpContext) lookup(x *Vertex, pos token.Pos, l Feature) *Vertex {
 	}
 
 	var kind Kind
-	if x.Value != nil {
-		kind = x.Value.Kind()
+	if x.BaseValue != nil {
+		kind = x.BaseValue.Kind()
 	}
 
 	switch kind {
@@ -676,7 +676,7 @@ func (c *OpContext) node(x Expr, scalar bool) *Vertex {
 
 	node, ok := v.(*Vertex)
 	if ok {
-		v = node.ActualValue()
+		v = node.Value()
 	}
 	switch nv := v.(type) {
 	case nil:
@@ -966,7 +966,7 @@ func (c *OpContext) newBool(b bool) Value {
 }
 
 func (c *OpContext) newList(src ast.Node, parent *Vertex) *Vertex {
-	return &Vertex{Parent: parent, Value: &ListMarker{}}
+	return &Vertex{Parent: parent, BaseValue: &ListMarker{}}
 }
 
 // Str reports a debug string of x.

internal/core/adt/default.go

@@ -43,7 +43,7 @@ func (d *Disjunction) Default() Value {
 
 // Default returns the default value or itself if there is no default.
 func (v *Vertex) Default() *Vertex {
-	switch d := v.Value.(type) {
+	switch d := v.BaseValue.(type) {
 	default:
 		return v
 
@@ -57,7 +57,7 @@ func (v *Vertex) Default() *Vertex {
 			w = d.Values[0]
 		default:
 			x := *v
-			x.Value = &Disjunction{
+			x.BaseValue = &Disjunction{
 				Src:         d.Src,
 				Values:      d.Values[:d.NumDefaults],
 				NumDefaults: 0,
@@ -79,7 +79,7 @@ func (v *Vertex) Default() *Vertex {
 
 		w := *v
 		w.Closed = nil
-		w.Value = &m
+		w.BaseValue = &m
 		return &w
 	}
 }

internal/core/adt/errors.go

@@ -130,7 +130,7 @@ func isIncomplete(v *Vertex) bool {
 	if v == nil {
 		return true
 	}
-	if b, ok := v.Value.(*Bottom); ok {
+	if b, ok := v.BaseValue.(*Bottom); ok {
 		return b.IsIncomplete()
 	}
 	return false
@@ -148,10 +148,10 @@ func (v *Vertex) AddChildError(recursive *Bottom) {
 	if recursive.IsIncomplete() {
 		return
 	}
-	x := v.Value
+	x := v.BaseValue
 	err, _ := x.(*Bottom)
 	if err == nil {
-		v.Value = &Bottom{
+		v.BaseValue = &Bottom{
 			Code:         recursive.Code,
 			Value:        v,
 			HasRecursive: true,
@@ -166,7 +166,7 @@ func (v *Vertex) AddChildError(recursive *Bottom) {
 		err.Code = recursive.Code
 	}
 
-	v.Value = err
+	v.BaseValue = err
 }
 
 // CombineErrors combines two errors that originate at the same Vertex.