@@ -939,6 +939,8 @@ issue3729.withoutDisjunction.root.#sub1.#sub2: conflicting values null and {#sub
939
939
./issue3729.cue:11:9
940
940
noStackOverflowStructCycle.#list.tail: structural cycle
941
941
noStackOverflowStructCycle.list.tail: structural cycle
942
+ provideIncompleteSuccess.t2.a.c.d: field not allowed:
943
+ ./in.cue:203:8
942
944
structShare.err1.x.d.e: field not allowed:
943
945
./in.cue:591:9
944
946
fieldMismatch.a: cannot combine regular field "x" with 2:
@@ -1099,7 +1101,8 @@ Result:
1099
1101
// [structural cycle] noStackOverflowStructCycle.list.tail: structural cycle
1100
1102
}
1101
1103
}
1102
- provideIncompleteSuccess: (struct){
1104
+ provideIncompleteSuccess: (_|_){
1105
+ // [eval]
1103
1106
t1: (struct){
1104
1107
#a: (_|_){
1105
1108
// [incomplete] provideIncompleteSuccess.t1.#a: incomplete bool: bool:
@@ -1112,15 +1115,22 @@ Result:
1112
1115
}
1113
1116
y: ~(provideIncompleteSuccess.t1.x)
1114
1117
}
1115
- t2: (struct){
1118
+ t2: (_|_){
1119
+ // [eval]
1116
1120
#a: (#struct){
1117
1121
c: (int){ 4 }
1118
1122
b: (bool){ true }
1119
1123
}
1120
1124
#c: (#struct){
1121
1125
}
1122
- a: (struct){
1123
- c: (#struct){
1126
+ a: (_|_){
1127
+ // [eval]
1128
+ c: (_|_){
1129
+ // [eval]
1130
+ d: (_|_){
1131
+ // [eval] provideIncompleteSuccess.t2.a.c.d: field not allowed:
1132
+ // ./in.cue:203:8
1133
+ }
1124
1134
}
1125
1135
b: (bool){ true }
1126
1136
}
@@ -1773,7 +1783,7 @@ Result:
1773
1783
diff old new
1774
1784
--- old
1775
1785
+++ new
1776
- @@ -1,39 +1,17 @@
1786
+ @@ -1,39 +1,19 @@
1777
1787
Errors:
1778
1788
embed.fail1.p: field not allowed:
1779
1789
- ./in.cue:37:9
@@ -1801,10 +1811,10 @@ diff old new
1801
1811
./issue3729.cue:11:9
1802
1812
noStackOverflowStructCycle.#list.tail: structural cycle
1803
1813
noStackOverflowStructCycle.list.tail: structural cycle
1804
- - provideIncompleteSuccess.t2.a.c.d: field not allowed:
1814
+ provideIncompleteSuccess.t2.a.c.d: field not allowed:
1805
1815
- ./in.cue:200:7
1806
1816
- ./in.cue:202:4
1807
- - ./in.cue:203:8
1817
+ ./in.cue:203:8
1808
1818
- ./in.cue:208:7
1809
1819
structShare.err1.x.d.e: field not allowed:
1810
1820
- ./in.cue:588:15
@@ -1813,7 +1823,7 @@ diff old new
1813
1823
./in.cue:591:9
1814
1824
fieldMismatch.a: cannot combine regular field "x" with 2:
1815
1825
./in.cue:152:7
1816
- @@ -79,8 +57 ,8 @@
1826
+ @@ -79,8 +59 ,8 @@
1817
1827
}
1818
1828
fail: (struct){
1819
1829
a: (_|_){
@@ -1824,7 +1834,7 @@ diff old new
1824
1834
}
1825
1835
}
1826
1836
embed: (_|_){
1827
- @@ -89,10 +67 ,6 @@
1837
+ @@ -89,10 +69 ,6 @@
1828
1838
// [eval]
1829
1839
p: (_|_){
1830
1840
// [eval] embed.fail1.p: field not allowed:
@@ -1835,7 +1845,7 @@ diff old new
1835
1845
// ./in.cue:46:4
1836
1846
// ./in.cue:49:9
1837
1847
}
1838
- @@ -121,12 +95 ,11 @@
1848
+ @@ -121,12 +97 ,11 @@
1839
1849
// [eval]
1840
1850
p: (_|_){
1841
1851
// [eval] embed.fail4.p: field not allowed:
@@ -1852,17 +1862,7 @@ diff old new
1852
1862
}
1853
1863
}
1854
1864
#C4: (#struct){
1855
- @@ -198,8 +171,7 @@
1856
- // [structural cycle] noStackOverflowStructCycle.list.tail: structural cycle
1857
- }
1858
- }
1859
- - provideIncompleteSuccess: (_|_){
1860
- - // [eval]
1861
- + provideIncompleteSuccess: (struct){
1862
- t1: (struct){
1863
- #a: (_|_){
1864
- // [incomplete] provideIncompleteSuccess.t1.#a: incomplete bool: bool:
1865
- @@ -207,16 +179,12 @@
1865
+ @@ -207,13 +182,10 @@
1866
1866
b: (bool){ bool }
1867
1867
}
1868
1868
x: (#struct){
@@ -1873,39 +1873,25 @@ diff old new
1873
1873
- c: (int){ 4 }
1874
1874
- b: (bool){ true }
1875
1875
- }
1876
- - }
1877
- - t2: (_|_){
1878
- - // [eval]
1879
1876
+ b: (bool){ true }
1880
1877
+ c: (int){ 4 }
1881
1878
+ }
1882
1879
+ y: ~(provideIncompleteSuccess.t1.x)
1883
- + }
1884
- + t2: (struct){
1885
- #a: (#struct){
1886
- c: (int){ 4 }
1887
- b: (bool){ true }
1888
- @@ -223,17 +191,8 @@
1889
- }
1890
- #c: (#struct){
1891
- }
1892
- - a: (_|_){
1893
- - // [eval]
1894
- - c: (_|_){
1895
- - // [eval]
1896
- - d: (_|_){
1897
- - // [eval] provideIncompleteSuccess.t2.a.c.d: field not allowed:
1880
+ }
1881
+ t2: (_|_){
1882
+ // [eval]
1883
+ @@ -229,10 +201,7 @@
1884
+ // [eval]
1885
+ d: (_|_){
1886
+ // [eval] provideIncompleteSuccess.t2.a.c.d: field not allowed:
1898
1887
- // ./in.cue:200:7
1899
1888
- // ./in.cue:202:4
1900
- - // ./in.cue:203:8
1889
+ // ./in.cue:203:8
1901
1890
- // ./in.cue:208:7
1902
- - }
1903
- + a: (struct){
1904
- + c: (#struct){
1891
+ }
1905
1892
}
1906
1893
b: (bool){ true }
1907
- }
1908
- @@ -263,9 +222,22 @@
1894
+ @@ -263,9 +232,22 @@
1909
1895
}
1910
1896
cyclicError: (struct){
1911
1897
a: (_|_){
@@ -1931,7 +1917,7 @@ diff old new
1931
1917
}
1932
1918
}
1933
1919
midwayReferences: (struct){
1934
- @@ -279,24 +251 ,9 @@
1920
+ @@ -279,24 +261 ,9 @@
1935
1921
}
1936
1922
}
1937
1923
}
@@ -1959,7 +1945,7 @@ diff old new
1959
1945
}
1960
1946
closedCheck: (struct){
1961
1947
success1: (struct){
1962
- @@ -399,13 +356 ,7 @@
1948
+ @@ -399,13 +366 ,7 @@
1963
1949
}
1964
1950
}
1965
1951
}
@@ -1974,7 +1960,7 @@ diff old new
1974
1960
#F: (#struct){
1975
1961
e: (bool){ bool }
1976
1962
f: (_|_){
1977
- @@ -422,17 +373 ,11 @@
1963
+ @@ -422,17 +383 ,11 @@
1978
1964
}
1979
1965
}
1980
1966
E: (_|_){
@@ -1993,7 +1979,7 @@ diff old new
1993
1979
}
1994
1980
}
1995
1981
derefDisj2: (struct){
1996
- @@ -443,17 +388 ,11 @@
1982
+ @@ -443,17 +398 ,11 @@
1997
1983
}
1998
1984
}
1999
1985
E: (_|_){
@@ -2012,7 +1998,7 @@ diff old new
2012
1998
}
2013
1999
}
2014
2000
bulk1: (struct){
2015
- @@ -576,9 +515 ,6 @@
2001
+ @@ -576,9 +525 ,6 @@
2016
2002
// [eval]
2017
2003
e: (_|_){
2018
2004
// [eval] structShare.err1.x.d.e: field not allowed:
@@ -2022,7 +2008,7 @@ diff old new
2022
2008
// ./in.cue:591:9
2023
2009
}
2024
2010
}
2025
- @@ -602,13 +538 ,13 @@
2011
+ @@ -602,13 +548 ,13 @@
2026
2012
}
2027
2013
envs: (struct){
2028
2014
e1: (#struct){
@@ -2040,7 +2026,7 @@ diff old new
2040
2026
}
2041
2027
}
2042
2028
}
2043
- @@ -645,9 +581 ,8 @@
2029
+ @@ -645,9 +591 ,8 @@
2044
2030
_c: (struct){
2045
2031
y: (int){ 1 }
2046
2032
}
@@ -2052,7 +2038,7 @@ diff old new
2052
2038
}
2053
2039
}
2054
2040
errorPropagation: (_|_){
2055
- @@ -705,10 +640 ,10 @@
2041
+ @@ -705,10 +650 ,10 @@
2056
2042
}
2057
2043
foo: (#struct){
2058
2044
kind: (string){ "foo" }
@@ -2065,7 +2051,7 @@ diff old new
2065
2051
}
2066
2052
}
2067
2053
regular: (_|_){
2068
- @@ -721,16 +656 ,11 @@
2054
+ @@ -721,16 +666 ,11 @@
2069
2055
foo: (_|_){
2070
2056
// [eval]
2071
2057
kind: (string){ "foo" }
@@ -2084,7 +2070,7 @@ diff old new
2084
2070
}
2085
2071
}
2086
2072
}
2087
- @@ -742,10 +672 ,10 @@
2073
+ @@ -742,10 +682 ,10 @@
2088
2074
}
2089
2075
foo: (#struct){
2090
2076
kind: (string){ "foo" }
@@ -2097,15 +2083,15 @@ diff old new
2097
2083
}
2098
2084
}
2099
2085
}
2100
- @@ -816,7 +746 ,6 @@
2086
+ @@ -816,7 +756 ,6 @@
2101
2087
root: (_|_){
2102
2088
// [eval] issue3729.withoutDisjunction.root.#sub1.#sub2: conflicting values null and {#sub1?:{#sub2:true}} (mismatched types null and struct):
2103
2089
// ./issue3729.cue:9:9
2104
2090
- // ./issue3729.cue:10:2
2105
2091
// ./issue3729.cue:11:9
2106
2092
#sub1?: (#struct){
2107
2093
#sub2: (bool){ true }
2108
- @@ -850,12 +779 ,7 @@
2094
+ @@ -850,12 +789 ,7 @@
2109
2095
#sub2?: (bool){ bool }
2110
2096
}
2111
2097
}
@@ -2119,7 +2105,7 @@ diff old new
2119
2105
#sub1?: (#struct){
2120
2106
#sub2: (bool){ true }
2121
2107
}
2122
- @@ -864,14 +788 ,7 @@
2108
+ @@ -864,14 +798 ,7 @@
2123
2109
}
2124
2110
full: (struct){
2125
2111
#Application: (#struct){
@@ -2136,15 +2122,15 @@ diff old new
2136
2122
#ApplicationSpec: (#struct){
2137
2123
syncPolicy?: ((null|struct)){ |((null){ null }, (#struct){
2138
2124
-- out/evalalpha/stats --
2139
- Leaks: 620
2125
+ Leaks: 636
2140
2126
Freed: 0
2141
2127
Reused: 0
2142
- Allocs: 620
2128
+ Allocs: 636
2143
2129
Retain: 0
2144
2130
2145
- Unifications: 570
2146
- Conjuncts: 943
2147
- Disjuncts: 28
2131
+ Unifications: 578
2132
+ Conjuncts: 965
2133
+ Disjuncts: 32
2148
2134
-- diff/-out/evalalpha/stats<==>+out/eval/stats --
2149
2135
diff old new
2150
2136
--- old
@@ -2155,18 +2141,18 @@ diff old new
2155
2141
-Reused: 510
2156
2142
-Allocs: 71
2157
2143
-Retain: 107
2158
- +Leaks: 620
2144
+ +Leaks: 636
2159
2145
+Freed: 0
2160
2146
+Reused: 0
2161
- +Allocs: 620
2147
+ +Allocs: 636
2162
2148
+Retain: 0
2163
2149
2164
2150
-Unifications: 545
2165
2151
-Conjuncts: 870
2166
2152
-Disjuncts: 641
2167
- +Unifications: 570
2168
- +Conjuncts: 943
2169
- +Disjuncts: 28
2153
+ +Unifications: 578
2154
+ +Conjuncts: 965
2155
+ +Disjuncts: 32
2170
2156
-- out/eval/stats --
2171
2157
Leaks: 63
2172
2158
Freed: 518
@@ -2177,9 +2163,6 @@ Retain: 107
2177
2163
Unifications: 545
2178
2164
Conjuncts: 870
2179
2165
Disjuncts: 641
2180
- -- diff/todo/p2 --
2181
- provideIncompleteSuccess.t2.a.c.d: missing error: probably correct.
2182
- A bit esoteric, but should probably work.
2183
2166
-- diff/explanation --
2184
2167
cyclicError: improved error message.
2185
2168
nestedWithDynamicFieldOK: fixed bug.
0 commit comments