internal/core/adt: propagate completion signal if disjunction is resolved

When a Vertex completes, it signals dependent tasks
that they can now resume. Although this also happens
for individual disjuncts, this signal is not propagated
at the level of the field in which the disjunct is
defined. This should be the case if the disjunct is
disambiguated or if there is an ambiguated default.

Fixes #3681

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

Author: mpvl

cue/testdata/cycle/chain.txtar

@@ -460,7 +460,19 @@ Disjuncts:    8919
     }
     full: (struct){
       #RecurseN: (_|_){
-        // [cycle] cycle error
+        // [incomplete] issue2052.full.#RecurseN: error in call to list.Range: non-concrete value _:
+        //     ./issue2052.cue:111:15
+        #maxiter: (int){ |(*(int){ 4 }, (int){ &(>=0, int) }) }
+        #funcFactory: (#struct){
+          #next: (_){ _ }
+          #func: (_){ _ }
+        }
+        #funcs: (_|_){
+          // [incomplete] issue2052.full.#RecurseN: error in call to list.Range: non-concrete value _:
+          //     ./issue2052.cue:111:15
+          // issue2052.full.#RecurseN.#funcs: invalid interpolation: non-concrete value _ (type _):
+          //     ./issue2052.cue:117:11
+        }
       }
       #DepthF: (#struct){
         #next: (_){ _ }
@@ -1145,30 +1157,35 @@ diff old new
            #basic: ((null|string)){ |((string){ string }, (null){ null }) }
            out: (int){ 1 }
          }
-@@ -223,20 +215,8 @@
+@@ -223,19 +215,19 @@
        }
      }
      full: (struct){
 -      #RecurseN: (_){
 -        _
--        #maxiter: (int){ |(*(int){ 4 }, (int){ &(>=0, int) }) }
--        #funcFactory: (#struct){
--          #next: (_){ _ }
--          #func: (_){ _ }
--        }
++      #RecurseN: (_|_){
++        // [incomplete] issue2052.full.#RecurseN: error in call to list.Range: non-concrete value _:
++        //     ./issue2052.cue:111:15
+         #maxiter: (int){ |(*(int){ 4 }, (int){ &(>=0, int) }) }
+         #funcFactory: (#struct){
+           #next: (_){ _ }
+           #func: (_){ _ }
+         }
 -        #funcs: (#struct){
 -          "4": (null){ null }
 -          "0": (_){ _ }
 -          "1": (_){ _ }
 -          "2": (_){ _ }
 -          "3": (_){ _ }
--        }
-+      #RecurseN: (_|_){
-+        // [cycle] cycle error
++        #funcs: (_|_){
++          // [incomplete] issue2052.full.#RecurseN: error in call to list.Range: non-concrete value _:
++          //     ./issue2052.cue:111:15
++          // issue2052.full.#RecurseN.#funcs: invalid interpolation: non-concrete value _ (type _):
++          //     ./issue2052.cue:117:11
+         }
        }
        #DepthF: (#struct){
-         #next: (_){ _ }
-@@ -245,7 +225,13 @@
+@@ -245,7 +237,13 @@
            #basic: ((null|string|bytes|number)){ |((int){ int }, (number){ number }, (string){ string }, (bytes){ bytes }, (null){ null }) }
            out: (int){
              1
@@ -1183,7 +1200,7 @@ diff old new
            }
          }
        }
-@@ -258,98 +244,170 @@
+@@ -258,98 +256,170 @@
              #basic: ((null|string|bytes|number)){ |((int){ int }, (number){ number }, (string){ string }, (bytes){ bytes }, (null){ null }) }
              out: (int){
                1
@@ -1446,7 +1463,7 @@ diff old new
              }
            }
          }
-@@ -357,7 +415,13 @@
+@@ -357,7 +427,13 @@
          #basic: ((null|string|bytes|number)){ |((int){ int }, (number){ number }, (string){ string }, (bytes){ bytes }, (null){ null }) }
          out: (int){
            1
@@ -1461,7 +1478,7 @@ diff old new
          }
        }
        tree: (struct){
-@@ -371,49 +435,7 @@
+@@ -371,49 +447,7 @@
          }
          cow: (string){ "moo" }
        }
@@ -1512,7 +1529,7 @@ diff old new
          #in: (#struct){
            a: (#struct){
              foo: (string){ "bar" }
-@@ -425,6 +447,192 @@
+@@ -425,6 +459,192 @@
            }
            cow: (string){ "moo" }
          }

cue/testdata/eval/disjunctions.txtar

@@ -317,10 +317,7 @@ Result:
   issue3681: (struct){
     out: (struct){
       one: (string){ |(*(string){ "fallback" }, (string){ string }) }
-      two: (_|_){
-        // [incomplete] issue3681.out.two: invalid interpolation: non-concrete value _ (type _):
-        //     ./dependencies.cue:26:12
-      }
+      two: (string){ "fallback" }
     }
     strDefault: (string){ |(*(string){ "fallback" }, (string){ string }) }
     #strDefaultDef: (string){ |(*(string){ "fallback" }, (string){ string }) }
@@ -647,19 +644,7 @@ diff old new
      }
      #S: ((string|struct)){ |((string){ string }, (#struct){
        }) }
-@@ -80,7 +69,10 @@
-   issue3681: (struct){
-     out: (struct){
-       one: (string){ |(*(string){ "fallback" }, (string){ string }) }
--      two: (string){ "fallback" }
-+      two: (_|_){
-+        // [incomplete] issue3681.out.two: invalid interpolation: non-concrete value _ (type _):
-+        //     ./dependencies.cue:26:12
-+      }
-     }
-     strDefault: (string){ |(*(string){ "fallback" }, (string){ string }) }
-     #strDefaultDef: (string){ |(*(string){ "fallback" }, (string){ string }) }
-@@ -110,19 +102,12 @@
+@@ -110,19 +99,12 @@
      // [eval] f: 2 errors in empty disjunction:
      // f.name: conflicting values "int" and "str":
      //     ./in.cue:5:8
@@ -680,7 +665,7 @@ diff old new
    }
    e1: (struct){
      a: ((null|struct)){ |((null){ null }, (struct){
-@@ -234,8 +219,8 @@
+@@ -234,8 +216,8 @@
      e: (struct){
        foobar: (#struct){
          b: (#struct){
@@ -690,7 +675,7 @@ diff old new
          }
        }
      }
-@@ -337,6 +322,9 @@
+@@ -337,6 +319,9 @@
            let Ok#1 = (bool){ true }
          }, (#struct){
            _ok: (bool){ true }

internal/core/adt/disjunct2.go

@@ -351,6 +351,21 @@ func (n *nodeContext) processDisjunctions() *Bottom {
 		n.disjuncts = append(n.disjuncts, cross...)
 	}
 
+	var completed condition
+	numDefaults := 0
+	if len(n.disjuncts) == 1 {
+		completed = n.disjuncts[0].completed
+	}
+	for _, d := range n.disjuncts {
+		if d.defaultMode == isDefault {
+			numDefaults++
+			completed = d.completed
+		}
+	}
+	if numDefaults == 1 || len(n.disjuncts) == 1 {
+		n.signal(completed)
+	}
+
 	return nil
 }