internal/core/adt: support bulk adding of conjuncts

This allows us to remove references to
Vertex.Conjuncts in a few more occasions.

It is assumed that in all cases we are modifying
nodes pre evaluation.

Signed-off-by: Marcel van Lohuizen <[email protected]>
Change-Id: Ia2bedb0ea4f2a73e3b31cdcbdca78e7792ac14cf
Reviewed-on: https://review.gerrithub.io/c/cue-lang/cue/+/1202661
TryBot-Result: CUEcueckoo <[email protected]>
Reviewed-by: Matthew Sackman <[email protected]>
Unity-Result: CUE porcuepine <[email protected]>

Author: mpvl

internal/core/adt/composite.go

@@ -1252,6 +1252,12 @@ func (v *Vertex) InsertConjunct(c Conjunct) {
 	v.Conjuncts = append(v.Conjuncts, c)
 }
 
+// InsertConjunctsFrom is a low-level method to insert a conjuncts into a Vertex
+// from another Vertex.
+func (v *Vertex) InsertConjunctsFrom(w *Vertex) {
+	v.Conjuncts = append(v.Conjuncts, w.Conjuncts...)
+}
+
 // AddConjunct adds the given Conjuncts to v if it doesn't already exist.
 func (v *Vertex) AddConjunct(c Conjunct) *Bottom {
 	if v.BaseValue != nil && !isCyclePlaceholder(v.BaseValue) {

pkg/list/sort.go

@@ -69,12 +69,8 @@ func (s *valueSorter) Less(i, j int) bool {
 	saveX := *s.x
 	saveY := *s.y
 
-	for _, c := range x.V.Conjuncts {
-		s.x.AddConjunct(c)
-	}
-	for _, c := range y.V.Conjuncts {
-		s.y.AddConjunct(c)
-	}
+	s.x.InsertConjunctsFrom(x.V)
+	s.y.InsertConjunctsFrom(y.V)
 
 	// TODO(perf): if we can determine that the comparator values for
 	// x and y are idempotent (no arcs and a basevalue being top or
@@ -121,12 +117,8 @@ func (s *valueSorter) lessNew(i, j int) bool {
 	s.a[i].Core(&x)
 	s.a[j].Core(&y)
 
-	for _, c := range x.V.Conjuncts {
-		xa.AddConjunct(c)
-	}
-	for _, c := range y.V.Conjuncts {
-		ya.AddConjunct(c)
-	}
+	xa.InsertConjunctsFrom(x.V)
+	ya.InsertConjunctsFrom(y.V)
 
 	// TODO(perf): if we can determine that the comparator values for
 	// x and y are idempotent (no arcs and a basevalue being top or

tools/trim/trim.go

@@ -227,7 +227,7 @@ func (t *trimmer) addDominators(d, v *adt.Vertex, hasDisjunction bool) (doms *ad
 		Label:  v.Label,
 	}
 	if d != nil && hasDisjunction {
-		doms.Conjuncts = append(doms.Conjuncts, d.Conjuncts...)
+		doms.InsertConjunctsFrom(d)
 	}
 
 	hasDoms := false