internal/core/adt: fix handling of ellipsis in evalv3

There were two fields in the closeContext that duplicated functionality. By unifying the two we now handle ... correctly. Fixes #3572 Signed-off-by: Marcel van Lohuizen <mpvl@gmail.com> Change-Id: Ia7241af91186431a775d0ca430060710de9fb537 Reviewed-on: https://review.gerrithub.io/c/cue-lang/cue/+/1204259 Reviewed-by: Roger Peppe <rogpeppe@gmail.com> TryBot-Result: CUEcueckoo <cueckoo@cuelang.org> Unity-Result: CUE porcuepine <cue.porcuepine@gmail.com>
cue-lang · Nov 19, 2024 · c97d709 · c97d709
1 parent a2490a2
commit c97d709
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 74 deletions.
diff --git a/cue/testdata/builtins/closed.txtar b/cue/testdata/builtins/closed.txtar
@@ -64,12 +64,6 @@ Errors:
 b.x: field not allowed:
     ./in.cue:1:4
     ./in.cue:5:9
-issue3572.t1.a: field not allowed:
-    ./in.cue:45:7
-    ./in.cue:45:23
-issue3572.t2.a: field not allowed:
-    ./in.cue:47:6
-    ./in.cue:49:12
 
 Result:
 (_|_){
@@ -205,49 +199,31 @@ Result:
       }
     }
   }
-  issue3572: (_|_){
-    // [eval]
-    t1: (_|_){
-      // [eval]
-      a: (_|_){
-        // [eval] issue3572.t1.a: field not allowed:
-        //     ./in.cue:45:7
-        //     ./in.cue:45:23
-      }
+  issue3572: (struct){
+    t1: (#struct){
+      a: (int){ 5 }
     }
     e: (#struct){
     }
-    t2: (_|_){
-      // [eval]
-      a: (_|_){
-        // [eval] issue3572.t2.a: field not allowed:
-        //     ./in.cue:47:6
-        //     ./in.cue:49:12
-      }
+    t2: (#struct){
+      a: (int){ 5 }
     }
   }
 }
 -- diff/-out/evalalpha<==>+out/eval --
 diff old new
 --- old
 +++ new
-@@ -1,8 +1,13 @@
+@@ -1,7 +1,6 @@
  Errors:
  b.x: field not allowed:
 -    ./in.cue:1:10
 -    ./in.cue:5:4
 +    ./in.cue:1:4
      ./in.cue:5:9
-+issue3572.t1.a: field not allowed:
-+    ./in.cue:45:7
-+    ./in.cue:45:23
-+issue3572.t2.a: field not allowed:
-+    ./in.cue:47:6
-+    ./in.cue:49:12
 
  Result:
- (_|_){
-@@ -14,20 +19,19 @@
+@@ -14,20 +13,19 @@
    }
    b: (_|_){
      // [eval]
@@ -273,7 +249,7 @@ diff old new
      }
    }
    inDisjunctions: (struct){
-@@ -60,42 +64,50 @@
+@@ -60,42 +58,50 @@
            }) }
        }
        syslog: (#struct){
@@ -356,37 +332,6 @@ diff old new
              string: (#struct){
                a: (#struct){
                  b: (bool){ true }
-@@ -131,14 +143,25 @@
-       }
-     }
-   }
--  issue3572: (struct){
--    t1: (#struct){
--      a: (int){ 5 }
-+  issue3572: (_|_){
-+    // [eval]
-+    t1: (_|_){
-+      // [eval]
-+      a: (_|_){
-+        // [eval] issue3572.t1.a: field not allowed:
-+        //     ./in.cue:45:7
-+        //     ./in.cue:45:23
-+      }
-     }
-     e: (#struct){
-     }
--    t2: (#struct){
--      a: (int){ 5 }
-+    t2: (_|_){
-+      // [eval]
-+      a: (_|_){
-+        // [eval] issue3572.t2.a: field not allowed:
-+        //     ./in.cue:47:6
-+        //     ./in.cue:49:12
-+      }
-     }
-   }
- }
 -- diff/todo/p3 --
 Reordering
 Let differs.

diff --git a/internal/core/adt/conjunct.go b/internal/core/adt/conjunct.go
@@ -361,7 +361,7 @@ loop2:
 		}
 	}
 	if hasEllipsis {
-		ci.cc.hasEllipsis = true
+		ci.cc.isTotal = true
 	}
 	if !hasEmbed {
 		n.aStruct = s

diff --git a/internal/core/adt/debug.go b/internal/core/adt/debug.go
@@ -615,7 +615,7 @@ func (m *mermaidContext) pstr(cc *closeContext) string {
 	addFlag(cc.isEmbed, 'E')
 	addFlag(cc.isClosed, 'c')
 	addFlag(cc.isClosedOnce, 'C')
-	addFlag(cc.hasEllipsis, 'o')
+	addFlag(cc.isTotal, 'o')
 	flags.WriteByte(cc.arcType.String()[0])
 	io.Copy(w, flags)
 

diff --git a/internal/core/adt/fields.go b/internal/core/adt/fields.go
@@ -215,9 +215,6 @@ type closeContext struct {
 	// definition. This value propagates to itself and parents through isDef.
 	isDefOrig bool
 
-	// hasEllipsis indicates whether the node contains an ellipsis.
-	hasEllipsis bool
-
 	// hasTop indicates a node has at least one top conjunct.
 	hasTop bool
 
@@ -598,7 +595,7 @@ func (c *closeContext) decDependent(ctx *OpContext, kind depKind, dependant *clo
 
 	p := c.parent
 
-	if c.isDef && !c.hasEllipsis && (!c.hasTop || c.hasNonTop) {
+	if c.isDef && !c.isTotal && (!c.hasTop || c.hasNonTop) {
 		c.isClosed = true
 		if p != nil {
 			p.isDef = true
@@ -637,9 +634,6 @@ func (c *closeContext) decDependent(ctx *OpContext, kind depKind, dependant *clo
 		return
 	}
 
-	if c.hasEllipsis {
-		p.hasEllipsis = true
-	}
 	if c.hasTop {
 		p.hasTop = true
 	}

diff --git a/internal/core/adt/overlay.go b/internal/core/adt/overlay.go
@@ -326,7 +326,6 @@ func (ctx *overlayContext) initCloneCC(x *closeContext) {
 	o.disjunctCount = x.disjunctCount
 	o.isDef = x.isDef
 	o.isDefOrig = x.isDefOrig
-	o.hasEllipsis = x.hasEllipsis
 	o.hasTop = x.hasTop
 	o.hasNonTop = x.hasNonTop
 	o.isClosedOnce = x.isClosedOnce

diff --git a/internal/core/adt/unify.go b/internal/core/adt/unify.go
@@ -343,7 +343,7 @@ func (v *Vertex) unify(c *OpContext, needs condition, mode runMode) bool {
 
 	// validationCompleted
 	if n.completed&(subFieldsProcessed) != 0 {
-		n.node.HasEllipsis = n.node.cc().hasEllipsis
+		n.node.HasEllipsis = n.node.cc().isTotal
 
 		// The next piece of code used to address the following case
 		// (order matters)