Ugly fix for #2500 issue

cue-lang · Jul 26, 2023 · cd72a6e · cd72a6e
1 parent 31166ba
commit cd72a6e
Show file tree

Hide file tree

Showing 7 changed files with 68 additions and 193 deletions.
diff --git a/cue/testdata/benchmarks/issue2500.txtar b/cue/testdata/benchmarks/issue2500.txtar
diff --git a/cue/testdata/comprehensions/iferror.txtar b/cue/testdata/comprehensions/iferror.txtar
@@ -151,11 +151,11 @@ Leaks:  0
 Freed:  43
 Reused: 35
 Allocs: 8
-Retain: 22
+Retain: 20
 
 Unifications: 33
 Conjuncts:    68
-Disjuncts:    60
+Disjuncts:    59
 -- out/eval --
 Errors:
 issue1972.err1: conflicting values [] and {someCondition:_,patchs:[...{}],patchs,if someCondition {patchs:_}} (mismatched types list and struct):

diff --git a/cue/testdata/cycle/023_reentrance.txtar b/cue/testdata/cycle/023_reentrance.txtar
@@ -67,11 +67,11 @@ Leaks:  16
 Freed:  180
 Reused: 169
 Allocs: 27
-Retain: 224
+Retain: 221
 
 Unifications: 196
 Conjuncts:    464
-Disjuncts:    292
+Disjuncts:    289
 -- out/eval --
 Errors:
 structural cycle:

diff --git a/internal/core/adt/comprehension.go b/internal/core/adt/comprehension.go
@@ -339,6 +339,11 @@ func (n *nodeContext) injectComprehensions(state vertexStatus) (progress bool) {
 			d.err = err
 			workRemaining = true
 
+			if n.ctx.IsIncompleteCheck && err.IsIncomplete() {
+				n.addBottom(err)
+				break
+			}
+
 			continue
 
 			// TODO: add this when it can be done without breaking other

diff --git a/internal/core/adt/context.go b/internal/core/adt/context.go
@@ -256,6 +256,9 @@ type OpContext struct {
 	// as an error if this is true.
 	// TODO: strictly separate validators and functions.
 	IsValidator bool
+
+	// Use fail fast mode to incomplete check.
+	IsIncompleteCheck bool
 }
 
 func (c *OpContext) CloseInfo() CloseInfo { return c.ci }
@@ -399,6 +402,22 @@ type frame struct {
 	ci  CloseInfo
 }
 
+type frameIncomplete struct {
+	incompleteCheck bool
+}
+
+func (c *OpContext) PushIncompleteCheck() frameIncomplete {
+	saved := frameIncomplete{
+		incompleteCheck: c.IsIncompleteCheck,
+	}
+	c.IsIncompleteCheck = true
+	return saved
+}
+
+func (c *OpContext) PopIncompleteCheck(s frameIncomplete) {
+	c.IsIncompleteCheck = s.incompleteCheck
+}
+
 func (c *OpContext) PushState(env *Environment, src ast.Node) (saved frame) {
 	saved.env = c.e
 	saved.err = c.errs

diff --git a/internal/core/adt/eval.go b/internal/core/adt/eval.go
@@ -489,8 +489,12 @@ func (n *nodeContext) postDisjunct(state vertexStatus) {
 		n.injectSelfComprehensions(state)
 	}
 
-	for n.expandOne(state) {
-	}
+	func() {
+		stack := n.ctx.PushIncompleteCheck()
+		defer n.ctx.PopIncompleteCheck(stack)
+		for n.expandOne(state) {
+		}
+	}()
 
 	switch err := n.getErr(); {
 	case err != nil:

diff --git a/internal/core/export/testdata/main/simplify.txtar b/internal/core/export/testdata/main/simplify.txtar
@@ -74,7 +74,7 @@ additional: {
 	s: strings.MinRunes(4) & strings.MaxRunes(7)
 	additional: {
 		env:   _
-		confs: _|_ // additional.confs: incomplete bool: _ (and 2 more errors)
+		confs: _|_ // additional.confs: incomplete bool: _
 	}
 }
 == All