internal/core/adt: merge Conjunct and Partial processing

There were some cases where conjuncts could be added after the Conjuncts state had been reached. This is okay, as there is a separate mechanism to verify such additions are legal. But not adding those can lead to lost information. Tests for this were added before and will be fixed after removing a workaround that worked around the issue fixed here, but introduced errors itself. Issue #2113 Fixes #2131 Signed-off-by: Marcel van Lohuizen <[email protected]> Change-Id: I74522731007393b96c6ba69acc688ca044067f3f Reviewed-on: https://review.gerrithub.io/c/cue-lang/cue/+/546598 Reviewed-by: Roger Peppe <[email protected]> Unity-Result: CUEcueckoo <[email protected]> TryBot-Result: CUEcueckoo <[email protected]>
cue-lang · Nov 24, 2022 · 121894c · 121894c
1 parent 129c343
commit 121894c
Show file tree

Hide file tree

Showing 115 changed files with 131 additions and 144 deletions.
diff --git a/cue/testdata/basicrewrite/018_self-reference_cycles.txtar b/cue/testdata/basicrewrite/018_self-reference_cycles.txtar
@@ -32,7 +32,7 @@ Retain: 7
 
 Unifications: 6
 Conjuncts:    22
-Disjuncts:    6
+Disjuncts:    7
 -- out/eval --
 (struct){
   a: (_|_){

diff --git a/cue/testdata/basicrewrite/019_resolved_self-reference_cycles.txtar b/cue/testdata/basicrewrite/019_resolved_self-reference_cycles.txtar
@@ -95,7 +95,7 @@ Retain: 4
 
 Unifications: 18
 Conjuncts:    37
-Disjuncts:    18
+Disjuncts:    21
 -- out/eval --
 (struct){
   a: (int){ 100 }

diff --git a/cue/testdata/basicrewrite/020_resolved_self-reference_cycles__Issue_19.txtar b/cue/testdata/basicrewrite/020_resolved_self-reference_cycles__Issue_19.txtar
@@ -58,7 +58,7 @@ Retain: 3
 
 Unifications: 6
 Conjuncts:    8
-Disjuncts:    6
+Disjuncts:    8
 -- out/eval --
 (struct){
   x: (int){ 200 }

diff --git a/cue/testdata/basicrewrite/aliases/aliases.txtar b/cue/testdata/basicrewrite/aliases/aliases.txtar
@@ -32,7 +32,7 @@ Retain: 2
 
 Unifications: 9
 Conjuncts:    15
-Disjuncts:    9
+Disjuncts:    10
 -- out/eval --
 (struct){
   t0: (struct){

diff --git a/cue/testdata/benchmarks/cycle.txtar b/cue/testdata/benchmarks/cycle.txtar
@@ -52,7 +52,7 @@ Retain: 1
 
 Unifications: 15
 Conjuncts:    30
-Disjuncts:    25
+Disjuncts:    26
 -- out/eval --
 (struct){
   sameValues: (struct){

diff --git a/cue/testdata/benchmarks/listdedup.txtar b/cue/testdata/benchmarks/listdedup.txtar
@@ -41,7 +41,7 @@ Retain: 1
 
 Unifications: 18724
 Conjuncts:    100730
-Disjuncts:    24096
+Disjuncts:    24097
 -- out/eval --
 (struct){
   A: (#struct){ |((#struct){

diff --git a/cue/testdata/builtins/056_issue314.txtar b/cue/testdata/builtins/056_issue314.txtar
@@ -84,7 +84,7 @@ Retain: 17
 
 Unifications: 45
 Conjuncts:    77
-Disjuncts:    45
+Disjuncts:    62
 -- out/eval --
 (struct){
   x: (#struct){

diff --git a/cue/testdata/builtins/closed.txtar b/cue/testdata/builtins/closed.txtar
@@ -50,7 +50,7 @@ Retain: 27
 
 Unifications: 178
 Conjuncts:    354
-Disjuncts:    188
+Disjuncts:    189
 -- out/eval --
 Errors:
 b.x: field not allowed:

diff --git a/cue/testdata/builtins/incomplete.txtar b/cue/testdata/builtins/incomplete.txtar
@@ -108,7 +108,7 @@ Retain: 32
 
 Unifications: 109
 Conjuncts:    265
-Disjuncts:    129
+Disjuncts:    147
 -- out/eval --
 Errors:
 badListType.decimal: cannot use 2 (type int) as list in argument 1 to list.Max:

diff --git a/cue/testdata/builtins/list/sort.txtar b/cue/testdata/builtins/list/sort.txtar
@@ -11,7 +11,7 @@ Retain: 2
 
 Unifications: 20
 Conjuncts:    33
-Disjuncts:    20
+Disjuncts:    22
 -- out/eval --
 (struct){
   a: (#list){

diff --git a/cue/testdata/compile/scope.txtar b/cue/testdata/compile/scope.txtar
@@ -86,7 +86,7 @@ Retain: 7
 
 Unifications: 52
 Conjuncts:    107
-Disjuncts:    52
+Disjuncts:    55
 -- out/eval --
 Errors:
 schema.next: structural cycle

diff --git a/cue/testdata/comprehensions/015_list_comprehension.txtar b/cue/testdata/comprehensions/015_list_comprehension.txtar
@@ -89,7 +89,7 @@ Retain: 5
 
 Unifications: 19
 Conjuncts:    39
-Disjuncts:    19
+Disjuncts:    20
 -- out/eval --
 (struct){
   a: (#list){

diff --git a/cue/testdata/comprehensions/checkdefined.txtar b/cue/testdata/comprehensions/checkdefined.txtar
@@ -68,7 +68,7 @@ Retain: 16
 
 Unifications: 49
 Conjuncts:    52
-Disjuncts:    49
+Disjuncts:    55
 -- out/eval --
 (struct){
   xc: (#struct){

diff --git a/cue/testdata/comprehensions/closed.txtar b/cue/testdata/comprehensions/closed.txtar
@@ -99,7 +99,7 @@ Retain: 6
 
 Unifications: 58
 Conjuncts:    104
-Disjuncts:    71
+Disjuncts:    73
 -- out/eval --
 Errors:
 disallowed.vErr.d: field not allowed:

diff --git a/cue/testdata/comprehensions/for.txtar b/cue/testdata/comprehensions/for.txtar
@@ -21,7 +21,7 @@ Retain: 9
 
 Unifications: 20
 Conjuncts:    20
-Disjuncts:    18
+Disjuncts:    21
 -- out/eval --
 Errors:
 k: invalid operand e (found int, want list or struct):

diff --git a/cue/testdata/comprehensions/iferror.txtar b/cue/testdata/comprehensions/iferror.txtar
@@ -155,7 +155,7 @@ Retain: 9
 
 Unifications: 33
 Conjuncts:    68
-Disjuncts:    43
+Disjuncts:    47
 -- out/eval --
 Errors:
 issue1972.err1: conflicting values [] and {someCondition:_,patchs:[...{}],patchs,if someCondition {patchs:_}} (mismatched types list and struct):

diff --git a/cue/testdata/comprehensions/issue1732.txtar b/cue/testdata/comprehensions/issue1732.txtar
@@ -130,7 +130,7 @@ Retain: 10
 
 Unifications: 112
 Conjuncts:    248
-Disjuncts:    120
+Disjuncts:    126
 -- out/eval --
 (struct){
   networkingv1: (struct){

diff --git a/cue/testdata/comprehensions/issue293.txtar b/cue/testdata/comprehensions/issue293.txtar
@@ -33,7 +33,7 @@ Retain: 3
 
 Unifications: 14
 Conjuncts:    25
-Disjuncts:    14
+Disjuncts:    15
 -- out/eval --
 Errors:
 z.x.f2: field not allowed:

diff --git a/cue/testdata/comprehensions/issue837.txtar b/cue/testdata/comprehensions/issue837.txtar
@@ -72,7 +72,7 @@ Retain: 11
 
 Unifications: 114
 Conjuncts:    291
-Disjuncts:    164
+Disjuncts:    173
 -- out/eval --
 Errors:
 _params.hsize.$_instances: conflicting values 1 and {$_instances:(>=0|*1)} (mismatched types int and struct):

diff --git a/cue/testdata/comprehensions/issue843.txtar b/cue/testdata/comprehensions/issue843.txtar
@@ -49,7 +49,7 @@ Retain: 16
 
 Unifications: 52
 Conjuncts:    120
-Disjuncts:    61
+Disjuncts:    65
 -- out/eval --
 (struct){
   #d1: (#struct){

diff --git a/cue/testdata/comprehensions/nested.txtar b/cue/testdata/comprehensions/nested.txtar
@@ -67,7 +67,7 @@ Retain: 13
 
 Unifications: 35
 Conjuncts:    96
-Disjuncts:    45
+Disjuncts:    57
 -- out/eval --
 (struct){
   service: (struct){

diff --git a/cue/testdata/comprehensions/pushdown.txtar b/cue/testdata/comprehensions/pushdown.txtar
@@ -667,7 +667,6 @@ errorPropagation: { // TODO(broken)
 }
 
 -- issue2131.cue --
-// TODO(broken)
 import "path"
 
 issue2131: tests: {
@@ -704,14 +703,14 @@ unifyDynamicReflectSuccess: {
 
 -- out/eval/stats --
 Leaks:  16
-Freed:  384
-Reused: 377
+Freed:  387
+Reused: 380
 Allocs: 23
 Retain: 69
 
-Unifications: 386
-Conjuncts:    622
-Disjuncts:    393
+Unifications: 389
+Conjuncts:    649
+Disjuncts:    432
 -- out/eval --
 Errors:
 embed.fail1.p: field not allowed:
@@ -1364,12 +1363,15 @@ Result:
       windows: (struct){
         eg1: (struct){
           in: (string){ "c:\\" }
+          out: (string){ "test" }
         }
         eg2: (struct){
           in: (string){ "c:\\test" }
+          out: (string){ "test" }
         }
         eg3: (struct){
           in: (string){ "c:\\test\\" }
+          out: (string){ "test" }
         }
       }
     }

diff --git a/cue/testdata/cycle/015_reference_across_tuples_and_back.txtar b/cue/testdata/cycle/015_reference_across_tuples_and_back.txtar
@@ -55,7 +55,7 @@ Retain: 3
 
 Unifications: 7
 Conjuncts:    13
-Disjuncts:    7
+Disjuncts:    9
 -- out/eval --
 (struct){
   a: (struct){

diff --git a/cue/testdata/cycle/023_reentrance.txtar b/cue/testdata/cycle/023_reentrance.txtar
@@ -71,7 +71,7 @@ Retain: 22
 
 Unifications: 137
 Conjuncts:    336
-Disjuncts:    137
+Disjuncts:    154
 -- out/eval --
 Errors:
 structural cycle:

diff --git a/cue/testdata/cycle/049_self-reference_cycles_conflicts_with_strings.txtar b/cue/testdata/cycle/049_self-reference_cycles_conflicts_with_strings.txtar
@@ -35,7 +35,7 @@ Retain: 1
 
 Unifications: 4
 Conjuncts:    6
-Disjuncts:    4
+Disjuncts:    5
 -- out/eval --
 Errors:
 a.x: conflicting values "hey!?" and "hey":

diff --git a/cue/testdata/cycle/051_resolved_self-reference_cycles_with_disjunction.txtar b/cue/testdata/cycle/051_resolved_self-reference_cycles_with_disjunction.txtar
@@ -179,7 +179,7 @@ Retain: 37
 
 Unifications: 31
 Conjuncts:    149
-Disjuncts:    49
+Disjuncts:    59
 -- out/eval --
 Errors:
 xe1: 2 errors in empty disjunction:

diff --git a/cue/testdata/cycle/052_resolved_self-reference_cycles_with_disjunction_with_defaults.txtar b/cue/testdata/cycle/052_resolved_self-reference_cycles_with_disjunction_with_defaults.txtar
@@ -133,7 +133,7 @@ Retain: 28
 
 Unifications: 27
 Conjuncts:    93
-Disjuncts:    44
+Disjuncts:    54
 -- out/eval --
 Errors:
 xe1: 2 errors in empty disjunction:

diff --git a/cue/testdata/cycle/builtins.txtar b/cue/testdata/cycle/builtins.txtar
@@ -77,7 +77,7 @@ Retain: 26
 
 Unifications: 37
 Conjuncts:    61
-Disjuncts:    37
+Disjuncts:    57
 -- out/eval --
 (struct){
   builtinCyclePerm0: (struct){

diff --git a/cue/testdata/cycle/chain.txtar b/cue/testdata/cycle/chain.txtar
@@ -215,8 +215,8 @@ Allocs: 64
 Retain: 143
 
 Unifications: 12118
-Conjuncts:    67550
-Disjuncts:    39375
+Conjuncts:    67551
+Disjuncts:    39452
 -- out/eval --
 (struct){
   chain: (struct){

diff --git a/cue/testdata/cycle/compbottom.txtar b/cue/testdata/cycle/compbottom.txtar
@@ -263,7 +263,7 @@ Retain: 64
 
 Unifications: 85
 Conjuncts:    149
-Disjuncts:    85
+Disjuncts:    111
 -- out/eval --
 (struct){
   simple: (struct){

diff --git a/cue/testdata/cycle/compbottom2.txtar b/cue/testdata/cycle/compbottom2.txtar
@@ -271,7 +271,7 @@ Retain: 31
 
 Unifications: 144
 Conjuncts:    159
-Disjuncts:    144
+Disjuncts:    159
 -- out/eval --
 (struct){
   self: (struct){

diff --git a/cue/testdata/cycle/compbottomnofinal.txtar b/cue/testdata/cycle/compbottomnofinal.txtar
@@ -365,7 +365,7 @@ Retain: 129
 
 Unifications: 111
 Conjuncts:    194
-Disjuncts:    103
+Disjuncts:    127
 -- out/eval --
 (struct){
   minimal: (struct){

diff --git a/cue/testdata/cycle/comprehension.txtar b/cue/testdata/cycle/comprehension.txtar
@@ -311,8 +311,8 @@ Allocs: 60
 Retain: 125
 
 Unifications: 828
-Conjuncts:    2518
-Disjuncts:    1316
+Conjuncts:    2539
+Disjuncts:    1375
 -- out/eval --
 Errors:
 selfReferential.insertionError.A: field foo3 not allowed by earlier comprehension or reference cycle

diff --git a/cue/testdata/cycle/constraints.txtar b/cue/testdata/cycle/constraints.txtar
@@ -442,7 +442,7 @@ Retain: 4
 
 Unifications: 143
 Conjuncts:    321
-Disjuncts:    143
+Disjuncts:    147
 -- out/eval --
 Errors:
 mutuallyTriggeringCycle.t1.x.c.b.b.b.b: structural cycle

diff --git a/cue/testdata/cycle/evaluate.txtar b/cue/testdata/cycle/evaluate.txtar
@@ -115,7 +115,7 @@ Retain: 127
 
 Unifications: 149
 Conjuncts:    291
-Disjuncts:    159
+Disjuncts:    171
 -- out/eval --
 Errors:
 closeCycle.a: structural cycle

diff --git a/cue/testdata/cycle/expression.txtar b/cue/testdata/cycle/expression.txtar
@@ -104,7 +104,7 @@ Retain: 41
 
 Unifications: 58
 Conjuncts:    424
-Disjuncts:    58
+Disjuncts:    75
 -- out/eval --
 (struct){
   t1: (struct){

diff --git a/cue/testdata/cycle/inline.txtar b/cue/testdata/cycle/inline.txtar
@@ -120,7 +120,7 @@ Retain: 38
 
 Unifications: 223
 Conjuncts:    699
-Disjuncts:    223
+Disjuncts:    225
 -- out/eval --
 Errors:
 structural cycle:

diff --git a/cue/testdata/cycle/inline_non_recursive.txtar b/cue/testdata/cycle/inline_non_recursive.txtar
@@ -68,7 +68,7 @@ Retain: 102
 
 Unifications: 680
 Conjuncts:    2709
-Disjuncts:    680
+Disjuncts:    731
 -- out/eval --
 (struct){
   ok1: (struct){

diff --git a/cue/testdata/cycle/issue242.txtar b/cue/testdata/cycle/issue242.txtar
@@ -97,7 +97,7 @@ Retain: 9
 
 Unifications: 26
 Conjuncts:    191
-Disjuncts:    78
+Disjuncts:    79
 -- out/eval --
 (struct){
   size: (int){ 2 }

diff --git a/cue/testdata/cycle/issue429.txtar b/cue/testdata/cycle/issue429.txtar
@@ -57,7 +57,7 @@ Retain: 7
 
 Unifications: 40
 Conjuncts:    149
-Disjuncts:    95
+Disjuncts:    96
 -- out/eval --
 Errors:
 er3.min: 2 errors in empty disjunction: