internal/core/adt: defensive use of CloseInfo

Passing CloseInfo in some cases where it doesn't seem to
be necessary.

Signed-off-by: Marcel van Lohuizen <[email protected]>
Change-Id: Ia3fc729fe951d227a05b9af40e6c4d49155af3f6
Reviewed-on: https://review.gerrithub.io/c/cue-lang/cue/+/542831
Unity-Result: CUEcueckoo <[email protected]>
TryBot-Result: CUEcueckoo <[email protected]>
Reviewed-by: Paul Jolly <[email protected]>

Author: mpvl

Diff for: cue/testdata/cycle/evaluate.txtar

@@ -54,6 +54,18 @@ embedCycle: {
 	c: a
 }
 
+listAddCycle: {
+	a: b
+	b: [c] + [c]
+	c: a
+}
+
+listMulCycle: {
+	a: b
+	b: 3 + [{a: b: c}]
+	c: a
+}
+
 // consult the correct closeness info in the face of it being passed down
 // from parent.
 closeFail: {
@@ -67,10 +79,10 @@ Errors:
 closeCycle.a: structural cycle
 closeCycle.b.d: structural cycle
 closeFail.x.b: field not allowed:
-    ./in.cue:59:6
-    ./in.cue:60:12
-    ./in.cue:61:6
-    ./in.cue:62:5
+    ./in.cue:71:6
+    ./in.cue:72:12
+    ./in.cue:73:6
+    ./in.cue:74:5
 listCycle.0: structural cycle:
     ./in.cue:17:9
 disjunctionCycle.a: cannot use 1 (type int) as list in argument 1 to and:
@@ -91,6 +103,8 @@ structCycle.0.d: structural cycle:
     ./in.cue:46:9
 embedCycle: structural cycle:
     ./in.cue:52:11
+listAddCycle.0: structural cycle:
+    ./in.cue:58:5
 
 Result:
 (_|_){
@@ -209,6 +223,33 @@ Result:
       //     ./in.cue:52:11
     }
   }
+  listAddCycle: (_|_){
+    // [structural cycle]
+    a: (_|_){
+      // [structural cycle] listAddCycle.0: structural cycle:
+      //     ./in.cue:58:5
+    }
+    b: (_|_){
+      // [structural cycle] listAddCycle.0: structural cycle:
+      //     ./in.cue:58:5
+    }
+    c: (_|_){
+      // [structural cycle] listAddCycle.0: structural cycle:
+      //     ./in.cue:58:5
+    }
+  }
+  listMulCycle: (_|_){
+    // [structural cycle]
+    a: (_|_){
+      // [structural cycle]
+    }
+    b: (_|_){
+      // [structural cycle]
+    }
+    c: (_|_){
+      // [structural cycle]
+    }
+  }
   closeFail: (_|_){
     // [eval]
     #T: (#struct){
@@ -219,10 +260,10 @@ Result:
       a: (string){ string }
       b: (_|_){
         // [eval] closeFail.x.b: field not allowed:
-        //     ./in.cue:59:6
-        //     ./in.cue:60:12
-        //     ./in.cue:61:6
-        //     ./in.cue:62:5
+        //     ./in.cue:71:6
+        //     ./in.cue:72:12
+        //     ./in.cue:73:6
+        //     ./in.cue:74:5
       }
     }
   }
@@ -290,6 +331,26 @@ Result:
     })
     c: 〈0;a〉
   }
+  listAddCycle: {
+    a: 〈0;b〉
+    b: ([
+      〈1;c〉,
+    ] + [
+      〈1;c〉,
+    ])
+    c: 〈0;a〉
+  }
+  listMulCycle: {
+    a: 〈0;b〉
+    b: (3 + [
+      {
+        a: {
+          b: 〈3;c〉
+        }
+      },
+    ])
+    c: 〈0;a〉
+  }
   closeFail: {
     #T: {
       [_]: _

Diff for: internal/core/adt/binop.go

@@ -205,7 +205,7 @@ func BinOp(c *OpContext, op Op, left, right Value) Value {
 			}
 
 			n := &Vertex{}
-			n.AddConjunct(MakeRootConjunct(c.Env(0), list))
+			n.AddConjunct(MakeConjunct(c.Env(0), list, c.ci))
 			n.Finalize(c)
 
 			return n
@@ -266,7 +266,7 @@ func BinOp(c *OpContext, op Op, left, right Value) Value {
 			}
 
 			n := &Vertex{}
-			n.AddConjunct(MakeRootConjunct(c.Env(0), list))
+			n.AddConjunct(MakeConjunct(c.Env(0), list, c.ci))
 			n.Finalize(c)
 
 			return n

Diff for: internal/core/adt/context.go

@@ -255,6 +255,8 @@ type OpContext struct {
 	inConstraint int
 }
 
+func (c *OpContext) CloseInfo() CloseInfo { return c.ci }
+
 func (n *nodeContext) skipNonMonotonicChecks() bool {
 	if n.ctx.inConstraint > 0 {
 		return false

Diff for: internal/core/adt/eval.go

@@ -2018,8 +2018,7 @@ func (n *nodeContext) addLists() (oneOfTheLists Expr, anID CloseInfo) {
 
 		for _, a := range elems {
 			if a.Conjuncts == nil {
-				x := a.BaseValue.(Value)
-				n.insertField(a.Label, MakeRootConjunct(nil, x))
+				n.insertField(a.Label, MakeRootConjunct(nil, a))
 				continue
 			}
 			for _, c := range a.Conjuncts {

Diff for: internal/core/compile/builtin.go

@@ -137,8 +137,9 @@ var orBuiltin = &adt.Builtin{
 		}
 		v := &adt.Vertex{}
 		// TODO: make a Disjunction.
-		v.AddConjunct(adt.MakeRootConjunct(nil,
+		v.AddConjunct(adt.MakeConjunct(nil,
 			&adt.DisjunctionExpr{Values: d, HasDefaults: false},
+			c.CloseInfo(),
 		))
 		c.Unify(v, adt.Finalized)
 		return v