Skip to content

Commit c925902

Browse files
committed
internal/core/adt: also create embed scope for disjunctions
Doing so increases the counters, but if it is not done, fields alongside the disjunction may be perceived to be in the wrong scope. Fixes #3964 Signed-off-by: Marcel van Lohuizen <[email protected]> Change-Id: Ie6f4347ce2a2703b7a7ce0d6c91c84d8e26cd7cc Reviewed-on: https://review.gerrithub.io/c/cue-lang/cue/+/1216871 Unity-Result: CUE porcuepine <[email protected]> TryBot-Result: CUEcueckoo <[email protected]> Reviewed-by: Daniel Martí <[email protected]>
1 parent 2597e9e commit c925902

File tree

12 files changed

+114
-185
lines changed

12 files changed

+114
-185
lines changed

cue/testdata/benchmarks/inlinedisjunction.txtar

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ Unifications: 16
2424
Conjuncts: 113
2525
Disjuncts: 58
2626

27-
CloseIDElems: 22
28-
NumCloseIDs: 3
27+
CloseIDElems: 312
28+
NumCloseIDs: 23
2929
-- out/eval --
3030
(struct){
3131
#def: (#struct){ |((#struct){
@@ -66,8 +66,8 @@ diff old new
6666
+Conjuncts: 113
6767
+Disjuncts: 58
6868
+
69-
+CloseIDElems: 22
70-
+NumCloseIDs: 3
69+
+CloseIDElems: 312
70+
+NumCloseIDs: 23
7171
-- out/eval/stats --
7272
Leaks: 0
7373
Freed: 4674

cue/testdata/benchmarks/listdedup.txtar

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ Unifications: 40
4343
Conjuncts: 98
4444
Disjuncts: 24
4545

46-
CloseIDElems: 956
47-
NumCloseIDs: 18
46+
CloseIDElems: 1206
47+
NumCloseIDs: 22
4848
-- out/evalalpha --
4949
(struct){
5050
A: (#struct){ |((#struct){
@@ -486,8 +486,8 @@ diff old new
486486
+Conjuncts: 98
487487
+Disjuncts: 24
488488
+
489-
+CloseIDElems: 956
490-
+NumCloseIDs: 18
489+
+CloseIDElems: 1206
490+
+NumCloseIDs: 22
491491
-- out/eval/stats --
492492
Leaks: 0
493493
Freed: 24096

cue/testdata/builtins/closed.txtar

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,8 @@ Unifications: 230
102102
Conjuncts: 360
103103
Disjuncts: 12
104104

105-
CloseIDElems: 1231
106-
NumCloseIDs: 88
105+
CloseIDElems: 2194
106+
NumCloseIDs: 106
107107
-- diff/-out/evalalpha/stats<==>+out/eval/stats --
108108
diff old new
109109
--- old
@@ -128,8 +128,8 @@ diff old new
128128
+Conjuncts: 360
129129
+Disjuncts: 12
130130
+
131-
+CloseIDElems: 1231
132-
+NumCloseIDs: 88
131+
+CloseIDElems: 2194
132+
+NumCloseIDs: 106
133133
-- out/eval/stats --
134134
Leaks: 61
135135
Freed: 214

cue/testdata/comprehensions/pushdown.txtar

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2326,8 +2326,8 @@ Unifications: 638
23262326
Conjuncts: 1093
23272327
Disjuncts: 48
23282328

2329-
CloseIDElems: 1779
2330-
NumCloseIDs: 290
2329+
CloseIDElems: 1815
2330+
NumCloseIDs: 292
23312331
-- diff/-out/evalalpha/stats<==>+out/eval/stats --
23322332
diff old new
23332333
--- old
@@ -2355,8 +2355,8 @@ diff old new
23552355
+Conjuncts: 1093
23562356
+Disjuncts: 48
23572357
+
2358-
+CloseIDElems: 1779
2359-
+NumCloseIDs: 290
2358+
+CloseIDElems: 1815
2359+
+NumCloseIDs: 292
23602360
-- out/eval/stats --
23612361
Leaks: 74
23622362
Freed: 602

0 commit comments

Comments
 (0)