internal/core/adt: rename cc to dst

This makes it clearer what the destination
closeContext is, versus to source, for
dependencies.

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

Author: mpvl

internal/core/adt/dep.go

@@ -150,7 +150,7 @@ func (c *closeContext) addArcDependency(ctx *OpContext, matched bool, key, child
 	c.arcs = append(c.arcs, ccArc{
 		matched: matched,
 		key:     key,
-		cc:      child,
+		dst:     child,
 	})
 
 	// TODO: this tests seems sensible, but panics. Investigate what could
@@ -192,7 +192,7 @@ func (c *closeContext) addNotificationDependency(ctx *OpContext, matched bool, k
 	c.notify = append(c.notify, ccArc{
 		matched: matched,
 		key:     key,
-		cc:      child,
+		dst:     child,
 	})
 
 	// TODO: this tests seems sensible, but panics. Investigate what could
@@ -287,7 +287,7 @@ func (c *closeContext) decDependent(ctx *OpContext, kind depKind, dependant *clo
 	c.done = true
 
 	for i, a := range c.arcs {
-		cc := a.cc
+		cc := a.dst
 		if a.decremented {
 			continue
 		}
@@ -296,7 +296,7 @@ func (c *closeContext) decDependent(ctx *OpContext, kind depKind, dependant *clo
 	}
 
 	for i, a := range c.notify {
-		cc := a.cc
+		cc := a.dst
 		if a.decremented {
 			continue
 		}

internal/core/adt/disjunct2.go

@@ -741,7 +741,7 @@ outer:
 			if a.key.src.Label != b.key.src.Label {
 				continue
 			}
-			if !equalPartialNode(ctx, a.cc, b.cc) {
+			if !equalPartialNode(ctx, a.dst, b.dst) {
 				return false
 			}
 			continue outer

internal/core/adt/fields.go

@@ -332,9 +332,9 @@ type ccArc struct {
 	// key is the closeContext is used to find the destination of the arc, which
 	// is the root context.
 	key *closeContext
-	// cc is the closeContext for which the counters are incremented and
+	// dst is the closeContext for which the counters are incremented and
 	// decremented and which is the actual destination of the dependency.
-	cc *closeContext
+	dst *closeContext
 }
 
 // A ccArcRef x refers to the x.src.arcs[x.index].
@@ -416,8 +416,8 @@ func (cc *closeContext) getKeyedCC(ctx *OpContext, key *closeContext, c CycleInf
 		a := &cc.arcs[i]
 		if a.key == key {
 			a.matched = a.matched && !checkClosed
-			a.cc.updateArcType(ctx, mode)
-			return a.cc
+			a.dst.updateArcType(ctx, mode)
+			return a.dst
 		}
 	}
 
@@ -892,7 +892,7 @@ func isTotal(p Value) bool {
 // this is not the case.
 func injectClosed(ctx *OpContext, closed, dst *closeContext) {
 	for _, a := range dst.arcs {
-		ca := a.cc
+		ca := a.dst
 		switch f := ca.Label(); {
 		case ca.src.ArcType == ArcOptional,
 			// Without this continue, an evaluation error may be propagated to
@@ -924,7 +924,7 @@ func (c *closeContext) allows(ctx *OpContext, f Feature) bool {
 	ctx.Assertf(token.NoPos, c.conjunctCount == 0, "unexpected 0 conjunctCount")
 
 	for _, b := range c.arcs {
-		cb := b.cc
+		cb := b.dst
 		if b.matched || f != cb.Label() {
 			continue
 		}

internal/core/adt/overlay.go

@@ -318,7 +318,7 @@ func (ctx *overlayContext) allocCC(cc *closeContext) *closeContext {
 	// We only explicitly tag dependencies of type ARC. Notifications that
 	// point within the disjunct overlay will be tagged elsewhere.
 	for _, a := range cc.arcs {
-		ctx.allocCC(a.cc)
+		ctx.allocCC(a.dst)
 	}
 
 	return o
@@ -438,26 +438,26 @@ func (ctx *overlayContext) initCloneCC(x *closeContext) {
 	for _, a := range x.arcs {
 		// If an arc does not have an overlay, we should not decrement the
 		// dependency counter. We simply remove the dependency in that case.
-		if a.cc.overlay == nil {
+		if a.dst.overlay == nil {
 			continue
 		}
 		if a.key.overlay != nil {
 			a.key = a.key.overlay // TODO: is this necessary?
 		}
-		a.cc = a.cc.overlay
+		a.dst = a.dst.overlay
 		o.arcs = append(o.arcs, a)
 	}
 
 	for _, a := range x.notify {
 		// If an arc does not have an overlay, we should not decrement the
 		// dependency counter. We simply remove the dependency in that case.
-		if a.cc.overlay == nil {
+		if a.dst.overlay == nil {
 			continue
 		}
 		if a.key.overlay != nil {
 			a.key = a.key.overlay // TODO: is this necessary?
 		}
-		a.cc = a.cc.overlay
+		a.dst = a.dst.overlay
 		o.notify = append(o.notify, a)
 	}
 

internal/core/adt/unify.go

@@ -572,7 +572,7 @@ func (n *nodeContext) completeAllArcs(needs condition, mode runMode) bool {
 		a.decremented = true
 
 		src.src.unify(n.ctx, needTasksDone, attemptOnly)
-		a.cc.decDependent(n.ctx, r.kind, src)
+		a.dst.decDependent(n.ctx, r.kind, src)
 	}
 
 	n.incDepth()