internal/core/adt: don't eliminate incomplete disjuncts prematurely

Fixes #782 Change-Id: I1fb63af222b44ceded352656d262c0dd29e120ad Reviewed-on: https://cue-review.googlesource.com/c/cue/+/8923 Reviewed-by: CUE cueckoo <cueckoo@gmail.com> Reviewed-by: Marcel van Lohuizen <mpvl@golang.org>
cuelang · Mar 7, 2021 · 3d926af · 3d926af
1 parent dcf932f
commit 3d926af
Show file tree

Hide file tree

Showing 2 changed files with 66 additions and 0 deletions.
diff --git a/cue/testdata/disjunctions/incomplete.txtar b/cue/testdata/disjunctions/incomplete.txtar
@@ -27,6 +27,29 @@ func: {
     ok1: yaml.MarshalStream(s) | yaml.Marshal(s)
 }
 
+issue782: {
+    a: {
+        inner:         string
+        interpolation: *"\(inner)" | string
+        interpolation: "override"
+    }
+    b: {
+        inner:         string
+        interpolation: string | *"\(inner)"
+        interpolation: "override"
+    }
+    c: {
+        inner:         string
+        interpolation: "\(inner)" | string
+        interpolation: "override"
+    }
+    d: {
+        inner:         string
+        interpolation: string | "\(inner)"
+        interpolation: "override"
+    }
+}
+
 -- out/eval --
 (struct){
   issue700: (struct){
@@ -78,6 +101,24 @@ func: {
       //     ./in.cue:26:10
     }
   }
+  issue782: (struct){
+    a: (struct){
+      inner: (string){ string }
+      interpolation: (string){ "override" }
+    }
+    b: (struct){
+      inner: (string){ string }
+      interpolation: (string){ "override" }
+    }
+    c: (struct){
+      inner: (string){ string }
+      interpolation: (string){ "override" }
+    }
+    d: (struct){
+      inner: (string){ string }
+      interpolation: (string){ "override" }
+    }
+  }
 }
 -- out/compile --
 --- in.cue
@@ -107,4 +148,26 @@ func: {
     s: string
     ok1: (〈import;"encoding/yaml"〉.MarshalStream(〈0;s〉)|〈import;"encoding/yaml"〉.Marshal(〈0;s〉))
   }
+  issue782: {
+    a: {
+      inner: string
+      interpolation: (*"\(〈0;inner〉)"|string)
+      interpolation: "override"
+    }
+    b: {
+      inner: string
+      interpolation: (string|*"\(〈0;inner〉)")
+      interpolation: "override"
+    }
+    c: {
+      inner: string
+      interpolation: ("\(〈0;inner〉)"|string)
+      interpolation: "override"
+    }
+    d: {
+      inner: string
+      interpolation: (string|"\(〈0;inner〉)")
+      interpolation: "override"
+    }
+  }
 }
diff --git a/internal/core/adt/disjunct.go b/internal/core/adt/disjunct.go
@@ -366,6 +366,9 @@ func (n *nodeContext) expandDisjuncts(
 	outer:
 		for _, d := range n.disjuncts {
 			for k, v := range p.disjuncts {
+				if !d.done() || !v.done() {
+					break
+				}
 				flags := CheckStructural
 				if last {
 					flags |= IgnoreOptional