+37

cmd/cue/cmd/testdata/script/exp_gengotypes.txtar

reviewed

··· 168 168 ] 169 169 -- cuetest/fail_check.stderr -- 170 170 fail.both."16_IntList".types.IntList.0: conflicting values "foo" and int (mismatched types string and int): 171 171 + ./cuetest/all.cue:20:1 172 172 + ./cuetest/all.cue:27:2 173 173 + ./cuetest/all.cue:28:56 171 174 ./cuetest/all.cue:67:40 172 175 ./cuetest/fail_check.cue:7:17 173 176 ./root/root.cue:9:8 174 177 ./root/root.cue:13:10 175 178 ./root/types.cue:26:23 176 179 fail.both."16_IntList".types.IntList.1: conflicting values "bar" and int (mismatched types string and int): 180 180 + ./cuetest/all.cue:20:1 181 181 + ./cuetest/all.cue:27:2 182 182 + ./cuetest/all.cue:28:56 177 183 ./cuetest/all.cue:67:47 178 184 ./cuetest/fail_check.cue:7:17 179 185 ./root/root.cue:9:8 180 186 ./root/root.cue:13:10 181 187 ./root/types.cue:26:23 182 188 fail.both."20_IntMap".types.IntMap.one: conflicting values "x" and int (mismatched types string and int): 189 189 + ./cuetest/all.cue:20:1 190 190 + ./cuetest/all.cue:27:2 191 191 + ./cuetest/all.cue:28:56 183 192 ./cuetest/all.cue:71:47 184 193 ./cuetest/fail_check.cue:7:17 185 194 ./root/root.cue:9:8 186 195 ./root/root.cue:13:10 187 196 ./root/types.cue:28:29 188 197 fail.both."20_IntMap".types.IntMap.two: conflicting values "y" and int (mismatched types string and int): 198 198 + ./cuetest/all.cue:20:1 199 199 + ./cuetest/all.cue:27:2 200 200 + ./cuetest/all.cue:28:56 189 201 ./cuetest/all.cue:71:59 190 202 ./cuetest/fail_check.cue:7:17 191 203 ./root/root.cue:9:8 ··· 196 208 ./cuetest/all.cue:27:2 197 209 ./cuetest/all.cue:28:56 198 210 ./cuetest/all.cue:89:43 211 211 + ./cuetest/fail_check.cue:7:17 212 212 + ./root/root.cue:9:8 213 213 + ./root/root.cue:13:10 199 214 ./root/types.cue:38:23 200 215 fail.both."40_NonEmptyString".types.NonEmptyString: conflicting values string and [1,2,3] (mismatched types string and list): 201 216 ./cuetest/all.cue:20:1 202 217 ./cuetest/all.cue:27:2 203 218 ./cuetest/all.cue:28:56 204 219 ./cuetest/all.cue:92:43 220 220 + ./cuetest/fail_check.cue:7:17 221 221 + ./root/root.cue:9:8 222 222 + ./root/root.cue:13:10 205 223 ./root/types.cue:38:23 206 224 fail.both."42_LinkedList".types.LinkedList.next: conflicting values "x" and {item?:_,next?:#linkedList} (mismatched types string and struct): 225 225 + ./cuetest/all.cue:20:1 226 226 + ./cuetest/all.cue:27:2 227 227 + ./cuetest/all.cue:28:56 207 228 ./cuetest/all.cue:94:50 208 229 ./cuetest/fail_check.cue:7:17 209 230 ./root/root.cue:9:8 ··· 216 237 ./cuetest/all.cue:27:2 217 238 ./cuetest/all.cue:28:56 218 239 ./cuetest/all.cue:96:51 240 240 + ./cuetest/fail_check.cue:7:17 241 241 + ./root/root.cue:9:8 242 242 + ./root/root.cue:13:10 243 243 + ./root/types.cue:41:23 219 244 ./root/types.cue:50:10 220 245 fail.both.notList: conflicting values [1,2,3] and {embedded2?:int} (mismatched types list and struct): 221 246 ./cuetest/all.cue:5:24 ··· 235 260 ./cuetest/all.cue:62:30 236 261 fail.cue."29_NullOrStruct".types.NullOrStruct: 2 errors in empty disjunction: 237 262 fail.cue."29_NullOrStruct".types.NullOrStruct: conflicting values "foo" and null (mismatched types string and null): 263 263 + ./cuetest/all.cue:20:1 264 264 + ./cuetest/all.cue:24:2 265 265 + ./cuetest/all.cue:25:55 238 266 ./cuetest/all.cue:81:43 239 267 ./cuetest/fail_check.cue:7:17 240 268 ./root/root.cue:9:8 241 269 ./root/root.cue:13:10 242 270 ./root/types.cue:35:23 243 271 fail.cue."29_NullOrStruct".types.NullOrStruct: conflicting values "foo" and {foo?:int} (mismatched types string and struct): 272 272 + ./cuetest/all.cue:20:1 273 273 + ./cuetest/all.cue:24:2 274 274 + ./cuetest/all.cue:25:55 244 275 ./cuetest/all.cue:81:43 245 276 ./cuetest/fail_check.cue:7:17 246 277 ./root/root.cue:9:8 ··· 248 279 ./root/types.cue:35:30 249 280 fail.cue."32_NullOrString".types.NullOrString: 2 errors in empty disjunction: 250 281 fail.cue."32_NullOrString".types.NullOrString: conflicting values 123 and null (mismatched types int and null): 282 282 + ./cuetest/all.cue:20:1 283 283 + ./cuetest/all.cue:24:2 284 284 + ./cuetest/all.cue:25:55 251 285 ./cuetest/all.cue:84:43 252 286 ./cuetest/fail_check.cue:7:17 253 287 ./root/root.cue:9:8 254 288 ./root/root.cue:13:10 255 289 ./root/types.cue:36:23 256 290 fail.cue."32_NullOrString".types.NullOrString: conflicting values 123 and string (mismatched types int and string): 291 291 + ./cuetest/all.cue:20:1 292 292 + ./cuetest/all.cue:24:2 293 293 + ./cuetest/all.cue:25:55 257 294 ./cuetest/all.cue:84:43 258 295 ./cuetest/fail_check.cue:7:17 259 296 ./root/root.cue:9:8

+11 -3

cue/testdata/comprehensions/iferror.txtar

reviewed

··· 163 163 -- out/evalalpha -- 164 164 Errors: 165 165 issue1972.err1: conflicting values [...{}] and {someCondition:_,patchs:[...{}],patchs,if someCondition {patchs:_}} (mismatched types list and struct): 166 166 + ./in.cue:53:8 167 167 + ./in.cue:55:3 166 168 ./in.cue:61:8 167 169 ./in.cue:63:11 168 170 wrongConcreteType: cannot use 2 (type int) as type bool: ··· 228 230 // [eval] 229 231 err1: (_|_){ 230 232 // [eval] issue1972.err1: conflicting values [...{}] and {someCondition:_,patchs:[...{}],patchs,if someCondition {patchs:_}} (mismatched types list and struct): 233 233 + // ./in.cue:53:8 234 234 + // ./in.cue:55:3 231 235 // ./in.cue:61:8 232 236 // ./in.cue:63:11 233 237 #patchs: (_|_){// [] ··· 245 249 diff old new 246 250 --- old 247 251 +++ new 248 248 - @@ -1,7 +1,7 @@ 252 252 + @@ -1,7 +1,9 @@ 249 253 Errors: 250 254 -issue1972.err1: conflicting values [] and {someCondition:_,patchs:[...{}],patchs,if someCondition {patchs:_}} (mismatched types list and struct): 251 255 - ./in.cue:54:12 252 256 +issue1972.err1: conflicting values [...{}] and {someCondition:_,patchs:[...{}],patchs,if someCondition {patchs:_}} (mismatched types list and struct): 257 257 + + ./in.cue:53:8 258 258 + + ./in.cue:55:3 253 259 ./in.cue:61:8 254 260 + ./in.cue:63:11 255 261 wrongConcreteType: cannot use 2 (type int) as type bool: 256 262 ./in.cue:4:2 257 263 ./in.cue:1:8 258 258 - @@ -8,8 +8,6 @@ 264 264 + @@ -8,8 +10,6 @@ 259 265 wrongType: cannot use int (type int) as type bool: 260 266 ./in.cue:10:2 261 267 ./in.cue:1:14 ··· 264 270 265 271 Result: 266 272 (_|_){ 267 267 - @@ -66,17 +64,17 @@ 273 273 + @@ -66,17 +66,19 @@ 268 274 issue1972: (_|_){ 269 275 // [eval] 270 276 err1: (_|_){ 271 277 - // [eval] issue1972.err1: conflicting values [] and {someCondition:_,patchs:[...{}],patchs,if someCondition {patchs:_}} (mismatched types list and struct): 272 278 - // ./in.cue:54:12 273 279 + // [eval] issue1972.err1: conflicting values [...{}] and {someCondition:_,patchs:[...{}],patchs,if someCondition {patchs:_}} (mismatched types list and struct): 280 280 + + // ./in.cue:53:8 281 281 + + // ./in.cue:55:3 274 282 // ./in.cue:61:8 275 283 - // issue1972.err1: invalid list index someCondition (type string): 276 284 - // ./in.cue:65:6

+10 -2

cue/testdata/cycle/disjunction.txtar

reviewed

··· 145 145 issue3042.data: 2 errors in empty disjunction: 146 146 issue3042.data: conflicting values [...#nesting] and {secret:{infra:[{name:"bar1"}]}} (mismatched types list and struct): 147 147 ./issue3042.cue:5:57 148 148 + ./issue3042.cue:7:8 148 149 ./issue3042.cue:7:19 149 150 issue3042.data: conflicting values string and {secret:{infra:[{name:"bar1"}]}} (mismatched types string and struct): 150 151 ./issue3042.cue:5:12 152 152 + ./issue3042.cue:7:8 151 153 ./issue3042.cue:7:19 152 154 153 155 Result: ··· 218 220 // [eval] issue3042.data: 2 errors in empty disjunction: 219 221 // issue3042.data: conflicting values [...#nesting] and {secret:{infra:[{name:"bar1"}]}} (mismatched types list and struct): 220 222 // ./issue3042.cue:5:57 223 223 + // ./issue3042.cue:7:8 221 224 // ./issue3042.cue:7:19 222 225 // issue3042.data: conflicting values string and {secret:{infra:[{name:"bar1"}]}} (mismatched types string and struct): 223 226 // ./issue3042.cue:5:12 227 227 + // ./issue3042.cue:7:8 224 228 // ./issue3042.cue:7:19 225 229 secret: (struct){ 226 230 infra: (list){ list } ··· 232 236 diff old new 233 237 --- old 234 238 +++ new 235 235 - @@ -1,9 +1,16 @@ 239 239 + @@ -1,9 +1,18 @@ 236 240 Errors: 237 241 cycle.a: structural cycle 238 242 +issue3042.data: 2 errors in empty disjunction: 239 243 +issue3042.data: conflicting values [...#nesting] and {secret:{infra:[{name:"bar1"}]}} (mismatched types list and struct): 240 244 + ./issue3042.cue:5:57 245 245 + + ./issue3042.cue:7:8 241 246 + ./issue3042.cue:7:19 242 247 +issue3042.data: conflicting values string and {secret:{infra:[{name:"bar1"}]}} (mismatched types string and struct): 243 248 + ./issue3042.cue:5:12 249 249 + + ./issue3042.cue:7:8 244 250 + ./issue3042.cue:7:19 245 251 246 252 Result: ··· 250 256 cycle: (_|_){ 251 257 // [structural cycle] 252 258 a: (_|_){ 253 253 - @@ -58,22 +65,24 @@ 259 259 + @@ -58,22 +67,26 @@ 254 260 x: (#list){ 255 261 } 256 262 } ··· 274 280 + // [eval] issue3042.data: 2 errors in empty disjunction: 275 281 + // issue3042.data: conflicting values [...#nesting] and {secret:{infra:[{name:"bar1"}]}} (mismatched types list and struct): 276 282 + // ./issue3042.cue:5:57 283 283 + + // ./issue3042.cue:7:8 277 284 + // ./issue3042.cue:7:19 278 285 + // issue3042.data: conflicting values string and {secret:{infra:[{name:"bar1"}]}} (mismatched types string and struct): 279 286 + // ./issue3042.cue:5:12 287 287 + + // ./issue3042.cue:7:8 280 288 + // ./issue3042.cue:7:19 281 289 + secret: (struct){ 282 290 + infra: (list){ list }

+48 -40

cue/testdata/cycle/structural.txtar

reviewed

··· 678 678 ./in.cue:421:6 679 679 e4.a.0.0: 2 errors in empty disjunction: 680 680 e4.a.0.0: conflicting values [{c:1}] and {c:1} (mismatched types list and struct): 681 681 + ./in.cue:420:6 681 682 ./in.cue:421:6 682 683 ./in.cue:421:7 683 684 e4.a.0.0: conflicting values [{c:1}] and {} (mismatched types list and struct): ··· 692 693 e4.b.0.0: conflicting values [{c:1}] and {c:1} (mismatched types list and struct): 693 694 ./in.cue:423:6 694 695 ./in.cue:423:7 696 696 + ./in.cue:424:6 695 697 e4.b.0.0: conflicting values [{c:1}] and {} (mismatched types list and struct): 696 698 ./in.cue:423:6 697 699 ./in.cue:424:6 ··· 1503 1505 // ./in.cue:421:6 1504 1506 // e4.a.0.0: 2 errors in empty disjunction: 1505 1507 // e4.a.0.0: conflicting values [{c:1}] and {c:1} (mismatched types list and struct): 1508 1508 + // ./in.cue:420:6 1506 1509 // ./in.cue:421:6 1507 1510 // ./in.cue:421:7 1508 1511 // e4.a.0.0: conflicting values [{c:1}] and {} (mismatched types list and struct): ··· 1525 1528 // e4.b.0.0: conflicting values [{c:1}] and {c:1} (mismatched types list and struct): 1526 1529 // ./in.cue:423:6 1527 1530 // ./in.cue:423:7 1531 1531 + // ./in.cue:424:6 1528 1532 // e4.b.0.0: conflicting values [{c:1}] and {} (mismatched types list and struct): 1529 1533 // ./in.cue:423:6 1530 1534 // ./in.cue:424:6 ··· 1865 1869 e1.a.c: structural cycle 1866 1870 e1.b.c: structural cycle 1867 1871 e2.a.c: structural cycle 1868 1868 - @@ -27,18 +35,16 @@ 1872 1872 + @@ -27,18 +35,17 @@ 1869 1873 e3.a: conflicting values [a] and {c:a} (mismatched types list and struct): 1870 1874 ./in.cue:412:5 1871 1875 ./in.cue:413:5 ··· 1882 1886 -e4.a.0.0: conflicting values [[{c:1}]] and {c:1} (mismatched types list and struct): 1883 1887 - ./in.cue:421:5 1884 1888 +e4.a.0.0: conflicting values [{c:1}] and {c:1} (mismatched types list and struct): 1889 1889 + + ./in.cue:420:6 1885 1890 + ./in.cue:421:6 1886 1891 ./in.cue:421:7 1887 1892 e4.a.0.0: conflicting values [{c:1}] and {} (mismatched types list and struct): 1888 1893 ./in.cue:420:6 1889 1889 - @@ -49,9 +55,9 @@ 1894 1894 + @@ -49,9 +56,10 @@ 1890 1895 ./in.cue:423:6 1891 1896 ./in.cue:424:10 1892 1897 e4.b.0.0: 2 errors in empty disjunction: ··· 1895 1900 + ./in.cue:423:6 1896 1901 ./in.cue:423:7 1897 1902 - ./in.cue:424:5 1903 1903 + + ./in.cue:424:6 1898 1904 e4.b.0.0: conflicting values [{c:1}] and {} (mismatched types list and struct): 1899 1905 ./in.cue:423:6 1900 1906 ./in.cue:424:6 1901 1901 - @@ -58,39 +64,43 @@ 1907 1907 + @@ -58,39 +66,43 @@ 1902 1908 ./in.cue:424:10 1903 1909 issue2545.#B.A: structural cycle 1904 1910 nestedList.v1e.y.0: 4 errors in empty disjunction: ··· 1959 1965 1960 1966 Result: 1961 1967 (_|_){ 1962 1962 - @@ -101,13 +111,9 @@ 1968 1968 + @@ -101,13 +113,9 @@ 1963 1969 // [structural cycle] 1964 1970 X: (_|_){ 1965 1971 // [structural cycle] ··· 1976 1982 } 1977 1983 } 1978 1984 } 1979 1979 - @@ -161,10 +167,7 @@ 1985 1985 + @@ -161,10 +169,7 @@ 1980 1986 a7: (struct){ 1981 1987 a: (string){ "foo" } 1982 1988 b: (struct){ ··· 1988 1994 y: (string){ "foo" } 1989 1995 } 1990 1996 c: (struct){ 1991 1991 - @@ -201,11 +204,17 @@ 1997 1997 + @@ -201,11 +206,17 @@ 1992 1998 } 1993 1999 } 1994 2000 b4: (_|_){ ··· 2011 2017 } 2012 2018 } 2013 2019 x: (_|_){ 2014 2014 - @@ -277,8 +286,7 @@ 2020 2020 + @@ -277,8 +288,7 @@ 2015 2021 // ./in.cue:94:13 2016 2022 // ./in.cue:94:14 2017 2023 // ./in.cue:95:9 ··· 2021 2027 } 2022 2028 } 2023 2029 } 2024 2024 - @@ -294,11 +302,20 @@ 2030 2030 + @@ -294,11 +304,20 @@ 2025 2031 } 2026 2032 } 2027 2033 b7: (_|_){ ··· 2047 2053 } 2048 2054 } 2049 2055 a: (_|_){ 2050 2050 - @@ -309,9 +326,7 @@ 2056 2056 + @@ -309,9 +328,7 @@ 2051 2057 } 2052 2058 } 2053 2059 b8: (struct){ ··· 2058 2064 a: (struct){ 2059 2065 f: (string){ string } 2060 2066 } 2061 2061 - @@ -337,7 +352,7 @@ 2067 2067 + @@ -337,7 +354,7 @@ 2062 2068 #ref: (#struct){ 2063 2069 ref: (string){ string } 2064 2070 } ··· 2067 2073 c: (#list){ 2068 2074 0: ((string|struct)){ |((string){ string }, (#struct){ 2069 2075 ref: (string){ string } 2070 2070 - @@ -360,7 +375,13 @@ 2076 2076 + @@ -360,7 +377,13 @@ 2071 2077 }) } 2072 2078 } 2073 2079 c: (#struct){ ··· 2082 2088 } 2083 2089 d: (struct){ 2084 2090 d: (struct){ 2085 2085 - @@ -370,9 +391,7 @@ 2091 2091 + @@ -370,9 +393,7 @@ 2086 2092 } 2087 2093 b11: (struct){ 2088 2094 #list: (#struct){ ··· 2093 2099 } 2094 2100 } 2095 2101 b12: (struct){ 2096 2096 - @@ -389,7 +408,11 @@ 2102 2102 + @@ -389,7 +410,11 @@ 2097 2103 value: (int){ 3 } 2098 2104 tail: (#struct){ 2099 2105 value: (int){ 4 } ··· 2106 2112 sum: (int){ 4 } 2107 2113 } 2108 2114 sum: (int){ 7 } 2109 2109 - @@ -461,10 +484,7 @@ 2115 2115 + @@ -461,10 +486,7 @@ 2110 2116 link: (#struct){ 2111 2117 a: (#struct){ 2112 2118 two: (#struct){ ··· 2118 2124 } 2119 2125 } 2120 2126 } 2121 2121 - @@ -538,10 +558,7 @@ 2127 2127 + @@ -538,10 +560,7 @@ 2122 2128 link: (#struct){ 2123 2129 a: (#list){ 2124 2130 0: (#struct){ ··· 2130 2136 } 2131 2137 } 2132 2138 } 2133 2133 - @@ -632,47 +649,27 @@ 2139 2139 + @@ -632,47 +651,27 @@ 2134 2140 // [structural cycle] 2135 2141 h: (int){ int } 2136 2142 t: (_|_){ ··· 2195 2201 c: (_|_){ 2196 2202 // [structural cycle] 2197 2203 d: (_|_){ 2198 2198 - @@ -699,28 +696,25 @@ 2204 2204 + @@ -699,28 +698,25 @@ 2199 2205 } 2200 2206 x: (_|_){ 2201 2207 // [structural cycle] ··· 2229 2235 #List: (#struct){ 2230 2236 Next: (null){ null } 2231 2237 } 2232 2232 - @@ -729,9 +723,7 @@ 2238 2238 + @@ -729,9 +725,7 @@ 2233 2239 // [structural cycle] 2234 2240 t1: (struct){ 2235 2241 #Foo: (#struct){ ··· 2240 2246 } 2241 2247 } 2242 2248 t2: (_|_){ 2243 2243 - @@ -739,10 +731,7 @@ 2249 2249 + @@ -739,10 +733,7 @@ 2244 2250 Foo: (_|_){ 2245 2251 // [structural cycle] 2246 2252 ref: (_|_){ ··· 2252 2258 } 2253 2259 } 2254 2260 } 2255 2255 - @@ -749,9 +738,7 @@ 2261 2261 + @@ -749,9 +740,7 @@ 2256 2262 } 2257 2263 comprehension: (struct){ 2258 2264 #list: (#struct){ ··· 2263 2269 } 2264 2270 } 2265 2271 } 2266 2266 - @@ -777,8 +764,7 @@ 2272 2272 + @@ -777,8 +766,7 @@ 2267 2273 } 2268 2274 } 2269 2275 let _schema_1#1 = (_|_){ ··· 2273 2279 } 2274 2280 } 2275 2281 fieldsSumInfinite: (_|_){ 2276 2276 - @@ -789,7 +775,8 @@ 2282 2282 + @@ -789,7 +777,8 @@ 2277 2283 fries: (float){ 2.00 } 2278 2284 sprite: (float){ 1.00 } 2279 2285 total: (_|_){ ··· 2283 2289 } 2284 2290 } 2285 2291 } 2286 2286 - @@ -804,9 +791,7 @@ 2292 2292 + @@ -804,9 +793,7 @@ 2287 2293 head: (int){ 3 } 2288 2294 tail: (struct){ 2289 2295 head: (int){ 2 } ··· 2294 2300 } 2295 2301 } 2296 2302 } 2297 2297 - @@ -813,12 +798,7 @@ 2303 2303 + @@ -813,12 +800,7 @@ 2298 2304 issue2545: (_|_){ 2299 2305 // [structural cycle] 2300 2306 #A: (#struct){ ··· 2308 2314 } 2309 2315 #B: (_|_){ 2310 2316 // [structural cycle] 2311 2311 - @@ -863,11 +843,9 @@ 2317 2317 + @@ -863,11 +845,9 @@ 2312 2318 // [eval] e3.a: conflicting values [a] and {c:a} (mismatched types list and struct): 2313 2319 // ./in.cue:412:5 2314 2320 // ./in.cue:413:5 ··· 2323 2329 } 2324 2330 } 2325 2331 b: (_|_){ 2326 2326 - @@ -874,11 +852,9 @@ 2332 2332 + @@ -874,11 +854,9 @@ 2327 2333 // [eval] e3.b: conflicting values [b] and {c:b} (mismatched types list and struct): 2328 2334 // ./in.cue:415:5 2329 2335 // ./in.cue:416:5 ··· 2338 2344 } 2339 2345 } 2340 2346 } 2341 2341 - @@ -892,8 +868,8 @@ 2347 2347 + @@ -892,8 +870,9 @@ 2342 2348 // ./in.cue:420:10 2343 2349 // ./in.cue:421:6 2344 2350 // e4.a.0.0: 2 errors in empty disjunction: 2345 2351 - // e4.a.0.0: conflicting values [[{c:1}]] and {c:1} (mismatched types list and struct): 2346 2352 - // ./in.cue:421:5 2347 2353 + // e4.a.0.0: conflicting values [{c:1}] and {c:1} (mismatched types list and struct): 2354 2354 + + // ./in.cue:420:6 2348 2355 + // ./in.cue:421:6 2349 2356 // ./in.cue:421:7 2350 2357 // e4.a.0.0: conflicting values [{c:1}] and {} (mismatched types list and struct): 2351 2358 // ./in.cue:420:6 2352 2352 - @@ -912,9 +888,9 @@ 2359 2359 + @@ -912,9 +891,10 @@ 2353 2360 // ./in.cue:423:6 2354 2361 // ./in.cue:424:10 2355 2362 // e4.b.0.0: 2 errors in empty disjunction: ··· 2358 2365 + // ./in.cue:423:6 2359 2366 // ./in.cue:423:7 2360 2367 - // ./in.cue:424:5 2368 2368 + + // ./in.cue:424:6 2361 2369 // e4.b.0.0: conflicting values [{c:1}] and {} (mismatched types list and struct): 2362 2370 // ./in.cue:423:6 2363 2371 // ./in.cue:424:6 2364 2364 - @@ -945,17 +921,19 @@ 2372 2372 + @@ -945,17 +925,19 @@ 2365 2373 // [eval] 2366 2374 0: (_|_){ 2367 2375 // [eval] nestedList.v1e.y.0: 4 errors in empty disjunction: ··· 2389 2397 1: (int){ 1 } 2390 2398 } 2391 2399 1: (int){ 1 } 2392 2392 - @@ -967,17 +945,19 @@ 2400 2400 + @@ -967,17 +949,19 @@ 2393 2401 // [eval] 2394 2402 0: (_|_){ 2395 2403 // [eval] nestedList.v2e.y.0: 4 errors in empty disjunction: ··· 2416 2424 1: (int){ 1 } 2417 2425 } 2418 2426 1: (int){ 1 } 2419 2419 - @@ -1031,7 +1011,10 @@ 2427 2427 + @@ -1031,7 +1015,10 @@ 2420 2428 head: (int){ 3 } 2421 2429 tail: (struct){ 2422 2430 head: (int){ 4 } ··· 2428 2436 } 2429 2437 } 2430 2438 } 2431 2431 - @@ -1045,7 +1028,10 @@ 2439 2439 + @@ -1045,7 +1032,10 @@ 2432 2440 head: (int){ 2 } 2433 2441 tail: (struct){ 2434 2442 head: (int){ 3 } ··· 2440 2448 } 2441 2449 } 2442 2450 } 2443 2443 - @@ -1059,8 +1045,12 @@ 2451 2451 + @@ -1059,8 +1049,12 @@ 2444 2452 head: (int){ 2 } 2445 2453 tail: (struct){ |((struct){ 2446 2454 head: (int){ 3 } ··· 2455 2463 }, (struct){ 2456 2464 head: (int){ 3 } 2457 2465 }) } 2458 2458 - @@ -1082,9 +1072,7 @@ 2466 2466 + @@ -1082,9 +1076,7 @@ 2459 2467 // [structural cycle] 2460 2468 f: (_|_){ 2461 2469 // [structural cycle] ··· 2466 2474 } 2467 2475 g: (_|_){ 2468 2476 // [structural cycle] 2469 2469 - @@ -1105,10 +1093,7 @@ 2477 2477 + @@ -1105,10 +1097,7 @@ 2470 2478 x: (_){ _ } 2471 2479 y: (_){ _ } 2472 2480 } ··· 2478 2486 } 2479 2487 } 2480 2488 t2: (struct){ 2481 2481 - @@ -1121,10 +1106,7 @@ 2489 2489 + @@ -1121,10 +1110,7 @@ 2482 2490 x: (_){ _ } 2483 2491 y: (_){ _ } 2484 2492 } ··· 2490 2498 } 2491 2499 } 2492 2500 t3: (struct){ 2493 2493 - @@ -1139,16 +1121,8 @@ 2501 2501 + @@ -1139,16 +1125,8 @@ 2494 2502 y: (_){ _ } 2495 2503 z: (_){ _ } 2496 2504 } ··· 2509 2517 } 2510 2518 } 2511 2519 t4: (struct){ 2512 2512 - @@ -1164,51 +1138,11 @@ 2520 2520 + @@ -1164,51 +1142,11 @@ 2513 2521 y: (_){ _ } 2514 2522 z: (_){ _ } 2515 2523 } ··· 2566 2574 } 2567 2575 } 2568 2576 t5: (struct){ 2569 2569 - @@ -1219,18 +1153,8 @@ 2577 2577 + @@ -1219,18 +1157,8 @@ 2570 2578 } 2571 2579 } 2572 2580 C: (struct){ ··· 2587 2595 } 2588 2596 } 2589 2597 } 2590 2590 - @@ -1253,19 +1177,19 @@ 2598 2598 + @@ -1253,19 +1181,19 @@ 2591 2599 } 2592 2600 } 2593 2601 n4: (struct){

+15 -1

cue/testdata/definitions/typocheck.txtar

reviewed

··· 1959 1959 b1: (_|_){ 1960 1960 // [incomplete] disjunction.withErr.t1.out.b1: 4 errors in empty disjunction: 1961 1961 // disjunction.withErr.t1.out.b1: conflicting values null and {b2:{b3:params.mayExistLater}} (mismatched types null and struct): 1962 1962 + // ./validators.cue:32:7 1962 1963 // ./validators.cue:33:7 1963 1964 // ./validators.cue:35:17 1964 1965 // disjunction.withErr.t1.out.b1.b2: 2 errors in empty disjunction: 1965 1966 // disjunction.withErr.t1.out.b1.b2: conflicting values null and {b3:params.mayExistLater} (mismatched types null and struct): 1967 1967 + // ./validators.cue:32:7 1966 1968 // ./validators.cue:33:11 1969 1969 + // ./validators.cue:35:24 1967 1970 // ./validators.cue:36:17 1968 1971 // disjunction.withErr.t1.out.b1.b2.b3: undefined field: mayExistLater: 1969 1972 // ./validators.cue:33:22 ··· 2795 2798 } 2796 2799 } 2797 2800 out: (#struct){ 2798 2798 - @@ -1423,17 +1276,8 @@ 2801 2801 + @@ -1415,25 +1268,19 @@ 2802 2802 + b1: (_|_){ 2803 2803 + // [incomplete] disjunction.withErr.t1.out.b1: 4 errors in empty disjunction: 2804 2804 + // disjunction.withErr.t1.out.b1: conflicting values null and {b2:{b3:params.mayExistLater}} (mismatched types null and struct): 2805 2805 + + // ./validators.cue:32:7 2806 2806 + // ./validators.cue:33:7 2807 2807 + // ./validators.cue:35:17 2808 2808 + // disjunction.withErr.t1.out.b1.b2: 2 errors in empty disjunction: 2809 2809 + // disjunction.withErr.t1.out.b1.b2: conflicting values null and {b3:params.mayExistLater} (mismatched types null and struct): 2810 2810 + + // ./validators.cue:32:7 2811 2811 + // ./validators.cue:33:11 2812 2812 + + // ./validators.cue:35:24 2799 2813 // ./validators.cue:36:17 2800 2814 // disjunction.withErr.t1.out.b1.b2.b3: undefined field: mayExistLater: 2801 2815 // ./validators.cue:33:22

+11 -3

cue/testdata/eval/comprehensions.txtar

reviewed

··· 136 136 Errors: 137 137 issue3691.original.a.b.c: conflicting values string and 1 (mismatched types string and int): 138 138 ./issue3691.cue:4:15 139 139 + ./issue3691.cue:5:15 139 140 ./issue3691.cue:6:5 140 141 ./issue3691.cue:7:3 141 142 ./issue3691.cue:8:10 142 143 issue3691.structuralCycle.a.b.c: conflicting values string and {[string]:X} (mismatched types string and struct): 143 144 ./issue3691.cue:14:15 144 145 ./issue3691.cue:15:5 146 146 + ./issue3691.cue:15:15 145 147 ./issue3691.cue:16:5 146 148 ./issue3691.cue:17:3 147 149 ./issue3691.cue:18:10 ··· 263 265 c: (_|_){ 264 266 // [eval] issue3691.original.a.b.c: conflicting values string and 1 (mismatched types string and int): 265 267 // ./issue3691.cue:4:15 268 268 + // ./issue3691.cue:5:15 266 269 // ./issue3691.cue:6:5 267 270 // ./issue3691.cue:7:3 268 271 // ./issue3691.cue:8:10 ··· 282 285 // [eval] issue3691.structuralCycle.a.b.c: conflicting values string and {[string]:X} (mismatched types string and struct): 283 286 // ./issue3691.cue:14:15 284 287 // ./issue3691.cue:15:5 288 288 + // ./issue3691.cue:15:15 285 289 // ./issue3691.cue:16:5 286 290 // ./issue3691.cue:17:3 287 291 // ./issue3691.cue:18:10 ··· 299 303 diff old new 300 304 --- old 301 305 +++ new 302 302 - @@ -1,14 +1,15 @@ 306 306 + @@ -1,14 +1,17 @@ 303 307 Errors: 304 308 issue3691.original.a.b.c: conflicting values string and 1 (mismatched types string and int): 305 309 ./issue3691.cue:4:15 310 310 + + ./issue3691.cue:5:15 306 311 + ./issue3691.cue:6:5 307 312 ./issue3691.cue:7:3 308 313 ./issue3691.cue:8:10 309 314 issue3691.structuralCycle.a.b.c: conflicting values string and {[string]:X} (mismatched types string and struct): 310 315 ./issue3691.cue:14:15 311 316 ./issue3691.cue:15:5 317 317 + + ./issue3691.cue:15:15 312 318 + ./issue3691.cue:16:5 313 319 ./issue3691.cue:17:3 314 320 ./issue3691.cue:18:10 ··· 316 322 317 323 Result: 318 324 (_|_){ 319 319 - @@ -127,6 +128,7 @@ 325 325 + @@ -127,6 +130,8 @@ 320 326 c: (_|_){ 321 327 // [eval] issue3691.original.a.b.c: conflicting values string and 1 (mismatched types string and int): 322 328 // ./issue3691.cue:4:15 329 329 + + // ./issue3691.cue:5:15 323 330 + // ./issue3691.cue:6:5 324 331 // ./issue3691.cue:7:3 325 332 // ./issue3691.cue:8:10 326 333 } 327 327 - @@ -145,13 +147,12 @@ 334 334 + @@ -145,13 +150,13 @@ 328 335 // [eval] issue3691.structuralCycle.a.b.c: conflicting values string and {[string]:X} (mismatched types string and struct): 329 336 // ./issue3691.cue:14:15 330 337 // ./issue3691.cue:15:5 338 338 + + // ./issue3691.cue:15:15 331 339 + // ./issue3691.cue:16:5 332 340 // ./issue3691.cue:17:3 333 341 // ./issue3691.cue:18:10

+75

cue/testdata/eval/conflicts.txtar

reviewed

··· 27 27 Unifications: 15 28 28 Conjuncts: 23 29 29 Disjuncts: 15 30 30 + -- out/evalalpha -- 31 31 + Errors: 32 32 + t0.v: conflicting values int and string (mismatched types int and string): 33 33 + ./in.cue:1:4 34 34 + ./in.cue:2:4 35 35 + ./in.cue:5:5 36 36 + ./in.cue:5:9 37 37 + t1.x.a.b: conflicting values 4 and 3: 38 38 + ./in.cue:10:9 39 39 + ./in.cue:14:9 40 40 + ./in.cue:17:5 41 41 + ./in.cue:17:11 42 42 + 43 43 + Result: 44 44 + (_|_){ 45 45 + // [eval] 46 46 + i: (int){ int } 47 47 + s: (string){ string } 48 48 + t0: (_|_){ 49 49 + // [eval] 50 50 + v: (_|_){ 51 51 + // [eval] t0.v: conflicting values int and string (mismatched types int and string): 52 52 + // ./in.cue:1:4 53 53 + // ./in.cue:2:4 54 54 + // ./in.cue:5:5 55 55 + // ./in.cue:5:9 56 56 + } 57 57 + } 58 58 + t1: (_|_){ 59 59 + // [eval] 60 60 + #d1: (#struct){ 61 61 + a: (#struct){ 62 62 + b: (int){ 3 } 63 63 + } 64 64 + } 65 65 + #d2: (#struct){ 66 66 + a: (#struct){ 67 67 + b: (int){ 4 } 68 68 + } 69 69 + } 70 70 + x: (_|_){ 71 71 + // [eval] 72 72 + a: (_|_){ 73 73 + // [eval] 74 74 + b: (_|_){ 75 75 + // [eval] t1.x.a.b: conflicting values 4 and 3: 76 76 + // ./in.cue:10:9 77 77 + // ./in.cue:14:9 78 78 + // ./in.cue:17:5 79 79 + // ./in.cue:17:11 80 80 + } 81 81 + } 82 82 + } 83 83 + } 84 84 + } 85 85 + -- diff/-out/evalalpha<==>+out/eval -- 86 86 + diff old new 87 87 + --- old 88 88 + +++ new 89 89 + @@ -2,6 +2,7 @@ 90 90 + t0.v: conflicting values int and string (mismatched types int and string): 91 91 + ./in.cue:1:4 92 92 + ./in.cue:2:4 93 93 + + ./in.cue:5:5 94 94 + ./in.cue:5:9 95 95 + t1.x.a.b: conflicting values 4 and 3: 96 96 + ./in.cue:10:9 97 97 + @@ -20,6 +21,7 @@ 98 98 + // [eval] t0.v: conflicting values int and string (mismatched types int and string): 99 99 + // ./in.cue:1:4 100 100 + // ./in.cue:2:4 101 101 + + // ./in.cue:5:5 102 102 + // ./in.cue:5:9 103 103 + } 104 104 + } 30 105 -- out/eval -- 31 106 Errors: 32 107 t0.v: conflicting values int and string (mismatched types int and string):

+18 -8

cue/testdata/eval/disjunctions.txtar

reviewed

··· 399 399 issue3606.data: 2 errors in empty disjunction: 400 400 issue3606.data: conflicting values string and {notAllowed:true} (mismatched types string and struct): 401 401 ./dependencies.cue:2:8 402 402 + ./dependencies.cue:4:6 402 403 ./dependencies.cue:6:6 403 404 issue3606.data.notAllowed: field not allowed: 404 405 ./dependencies.cue:3:3 ··· 412 413 // [eval] issue3606.data: 2 errors in empty disjunction: 413 414 // issue3606.data: conflicting values string and {notAllowed:true} (mismatched types string and struct): 414 415 // ./dependencies.cue:2:8 416 416 + // ./dependencies.cue:4:6 415 417 // ./dependencies.cue:6:6 416 418 // issue3606.data.notAllowed: field not allowed: 417 419 // ./dependencies.cue:3:3 ··· 875 877 diff old new 876 878 --- old 877 879 +++ new 878 878 - @@ -14,8 +14,6 @@ 880 880 + @@ -11,11 +11,10 @@ 881 881 + issue3606.data: 2 errors in empty disjunction: 882 882 + issue3606.data: conflicting values string and {notAllowed:true} (mismatched types string and struct): 883 883 + ./dependencies.cue:2:8 884 884 + + ./dependencies.cue:4:6 879 885 ./dependencies.cue:6:6 880 886 issue3606.data.notAllowed: field not allowed: 881 887 ./dependencies.cue:3:3 ··· 884 890 885 891 Result: 886 892 (_|_){ 887 887 - @@ -29,14 +27,7 @@ 893 893 + @@ -26,17 +25,11 @@ 894 894 + // [eval] issue3606.data: 2 errors in empty disjunction: 895 895 + // issue3606.data: conflicting values string and {notAllowed:true} (mismatched types string and struct): 896 896 + // ./dependencies.cue:2:8 897 897 + + // ./dependencies.cue:4:6 888 898 // ./dependencies.cue:6:6 889 899 // issue3606.data.notAllowed: field not allowed: 890 900 // ./dependencies.cue:3:3 ··· 900 910 } 901 911 #S: ((string|struct)){ |((string){ string }, (#struct){ 902 912 }) } 903 903 - @@ -151,12 +142,7 @@ 913 913 + @@ -151,12 +144,7 @@ 904 914 // ./in.cue:15:4 905 915 // ./in.cue:15:27 906 916 name: (string){ "str" } ··· 914 924 } 915 925 e1: (struct){ 916 926 a: ((null|struct)){ |((null){ null }, (struct){ 917 917 - @@ -268,8 +254,8 @@ 927 927 + @@ -268,8 +256,8 @@ 918 928 e: (struct){ 919 929 foobar: (#struct){ 920 930 b: (#struct){ ··· 924 934 } 925 935 } 926 936 } 927 927 - @@ -279,10 +265,7 @@ 937 937 + @@ -279,10 +267,7 @@ 928 938 x: (int){ 0 } 929 939 } 930 940 inList1: (struct){ ··· 936 946 } 937 947 inList2: (struct){ 938 948 x: (int){ 0 } 939 939 - @@ -402,7 +385,7 @@ 949 949 + @@ -402,7 +387,7 @@ 940 950 let Ok#2 = (bool){ true } 941 951 }, (#struct){ 942 952 _ok: (bool){ true } ··· 945 955 x: (bool){ true } 946 956 }) } 947 957 bar: (#struct){ |((#struct){ 948 948 - @@ -437,9 +420,7 @@ 958 958 + @@ -437,9 +422,7 @@ 949 959 issue3891: (struct){ 950 960 reduced: (struct){ 951 961 x: (_){ |(*(int){ 1 }, (_){ _ }) } ··· 956 966 b: (struct){ 957 967 y: (int){ 1 } 958 968 } 959 959 - @@ -475,14 +456,14 @@ 969 969 + @@ -475,14 +458,14 @@ 960 970 } 961 971 full: (struct){ 962 972 out: (#struct){

+67 -13

cue/testdata/eval/issue3672.txtar

reviewed

··· 700 700 // [eval] value0.xs.0.INL: conflicting values [...] and string (mismatched types list and string): 701 701 // ./x.cue:22:51 702 702 // ./x.cue:22:52 703 703 + // ./x.cue:28:12 703 704 // ./x.cue:44:29 704 705 // ./x.cue:51:14 705 706 // ./x.cue:53:18 706 707 // ./x.cue:55:19 707 708 // ./x.cue:62:25 708 709 // ./x.cue:70:12 710 710 + // ./x.cue:70:47 709 711 // ./x.cue:109:13 710 712 // ./x.cue:111:13 711 713 // ./x.cue:111:18 ··· 713 715 // value0.xs.0.INL: conflicting values [...] and {Append:#ConfigText} (mismatched types list and struct): 714 716 // ./x.cue:22:51 715 717 // ./x.cue:22:52 718 718 + // ./x.cue:28:12 716 719 // ./x.cue:44:29 717 720 // ./x.cue:53:32 718 721 // ./x.cue:55:19 719 722 // ./x.cue:62:25 720 723 // ./x.cue:70:12 724 724 + // ./x.cue:70:47 721 725 // ./x.cue:109:13 722 726 // ./x.cue:111:13 723 727 // ./x.cue:111:18 ··· 725 729 // value0.xs.0.INL: conflicting values [...] and {Prepend:#ConfigText} (mismatched types list and struct): 726 730 // ./x.cue:22:51 727 731 // ./x.cue:22:52 732 732 + // ./x.cue:28:12 728 733 // ./x.cue:44:29 729 734 // ./x.cue:53:56 730 735 // ./x.cue:55:19 731 736 // ./x.cue:62:25 732 737 // ./x.cue:70:12 738 738 + // ./x.cue:70:47 733 739 // ./x.cue:109:13 734 740 // ./x.cue:111:13 735 741 // ./x.cue:111:18 ··· 737 743 // value0.xs.0.INL: conflicting values [...] and {UseSectionName:true} (mismatched types list and struct): 738 744 // ./x.cue:22:51 739 745 // ./x.cue:22:52 746 746 + // ./x.cue:28:12 740 747 // ./x.cue:44:29 741 748 // ./x.cue:51:23 742 749 // ./x.cue:53:18 743 750 // ./x.cue:55:19 744 751 // ./x.cue:62:25 745 752 // ./x.cue:70:12 753 753 + // ./x.cue:70:47 746 754 // ./x.cue:109:13 747 755 // ./x.cue:111:13 748 756 // ./x.cue:111:18 ··· 762 770 // ./x.cue:55:37 763 771 // ./x.cue:62:25 764 772 // ./x.cue:70:12 773 773 + // ./x.cue:92:13 765 774 // ./x.cue:94:13 766 775 // ./x.cue:109:13 767 776 // ./x.cue:112:3 ··· 788 797 // ./x.cue:55:37 789 798 // ./x.cue:62:25 790 799 // ./x.cue:70:12 800 800 + // ./x.cue:92:13 791 801 // ./x.cue:95:13 792 802 // ./x.cue:109:13 793 803 // ./x.cue:112:3 ··· 811 821 // ./x.cue:62:25 812 822 // ./x.cue:70:12 813 823 // ./x.cue:70:47 824 824 + // ./x.cue:75:13 814 825 // ./x.cue:77:13 815 826 // ./x.cue:77:18 816 827 // ./x.cue:96:3 ··· 974 985 } 975 986 } 976 987 value0: (#struct){ 977 977 - @@ -304,18 +338,21 @@ 988 988 + @@ -304,1171 +338,131 @@ 978 989 0: (string){ 979 990 "UseSectionName" 980 991 let INL#9 = (_|_){ ··· 992 1003 + // [eval] value0.xs.0.INL: conflicting values [...] and string (mismatched types list and string): 993 1004 + // ./x.cue:22:51 994 1005 + // ./x.cue:22:52 1006 1006 + + // ./x.cue:28:12 995 1007 + // ./x.cue:44:29 996 1008 + // ./x.cue:51:14 997 1009 + // ./x.cue:53:18 998 1010 + // ./x.cue:55:19 999 1011 + // ./x.cue:62:25 1000 1012 + // ./x.cue:70:12 1013 1013 + + // ./x.cue:70:47 1001 1014 + // ./x.cue:109:13 1002 1015 + // ./x.cue:111:13 1003 1016 + // ./x.cue:111:18 1004 1017 + // ./x.cue:123:9 1005 1018 // value0.xs.0.INL: conflicting values [...] and {Append:#ConfigText} (mismatched types list and struct): 1019 1019 + - // ./x.cue:22:52 1020 1020 + - // ./x.cue:44:29 1021 1021 + - // ./x.cue:53:32 1022 1022 + - // ./x.cue:55:19 1023 1023 + - // ./x.cue:62:25 1024 1024 + - // ./x.cue:70:12 1006 1025 + // ./x.cue:22:51 1007 1007 - // ./x.cue:22:52 1008 1008 - // ./x.cue:44:29 1009 1009 - // ./x.cue:53:32 1010 1010 - @@ -327,6 +364,7 @@ 1026 1026 + + // ./x.cue:22:52 1027 1027 + + // ./x.cue:28:12 1028 1028 + + // ./x.cue:44:29 1029 1029 + + // ./x.cue:53:32 1030 1030 + + // ./x.cue:55:19 1031 1031 + + // ./x.cue:62:25 1032 1032 + + // ./x.cue:70:12 1033 1033 + + // ./x.cue:70:47 1034 1034 + // ./x.cue:109:13 1035 1035 + // ./x.cue:111:13 1011 1036 // ./x.cue:111:18 1012 1037 // ./x.cue:123:9 1013 1038 // value0.xs.0.INL: conflicting values [...] and {Prepend:#ConfigText} (mismatched types list and struct): 1039 1039 + - // ./x.cue:22:52 1040 1040 + - // ./x.cue:44:29 1041 1041 + - // ./x.cue:53:56 1042 1042 + - // ./x.cue:55:19 1043 1043 + - // ./x.cue:62:25 1044 1044 + - // ./x.cue:70:12 1014 1045 + // ./x.cue:22:51 1015 1015 - // ./x.cue:22:52 1016 1016 - // ./x.cue:44:29 1017 1017 - // ./x.cue:53:56 1018 1018 - @@ -338,1131 +376,76 @@ 1046 1046 + + // ./x.cue:22:52 1047 1047 + + // ./x.cue:28:12 1048 1048 + + // ./x.cue:44:29 1049 1049 + + // ./x.cue:53:56 1050 1050 + + // ./x.cue:55:19 1051 1051 + + // ./x.cue:62:25 1052 1052 + + // ./x.cue:70:12 1053 1053 + + // ./x.cue:70:47 1054 1054 + // ./x.cue:109:13 1055 1055 + // ./x.cue:111:13 1019 1056 // ./x.cue:111:18 1020 1057 // ./x.cue:123:9 1021 1058 // value0.xs.0.INL: conflicting values [...] and {UseSectionName:true} (mismatched types list and struct): ··· 1041 1078 - // value0.xs.0.INL: 5 errors in empty disjunction:: 1042 1079 + // ./x.cue:22:51 1043 1080 + // ./x.cue:22:52 1081 1081 + + // ./x.cue:28:12 1044 1082 + // ./x.cue:44:29 1045 1083 + // ./x.cue:51:23 1046 1084 + // ./x.cue:53:18 1047 1085 + // ./x.cue:55:19 1048 1086 + // ./x.cue:62:25 1049 1087 + // ./x.cue:70:12 1088 1088 + + // ./x.cue:70:47 1050 1089 + // ./x.cue:109:13 1051 1090 + // ./x.cue:111:13 1052 1091 + // ./x.cue:111:18 ··· 1241 1280 + // ./x.cue:55:37 1242 1281 + // ./x.cue:62:25 1243 1282 + // ./x.cue:70:12 1283 1283 + + // ./x.cue:92:13 1244 1284 + // ./x.cue:94:13 1245 1285 + // ./x.cue:109:13 1246 1286 + // ./x.cue:112:3 ··· 1794 1834 + // ./x.cue:55:37 1795 1835 + // ./x.cue:62:25 1796 1836 + // ./x.cue:70:12 1837 1837 + + // ./x.cue:92:13 1797 1838 + // ./x.cue:95:13 1798 1839 + // ./x.cue:109:13 1799 1840 + // ./x.cue:112:3 ··· 2196 2237 } 2197 2238 let INS#5 = (_|_){ 2198 2239 // [eval] value0.xs.0.INS: conflicting values string and {UseSectionName:true} (mismatched types string and struct): 2240 2240 + - // ./x.cue:22:52 2241 2241 + - // ./x.cue:44:29 2242 2242 + - // ./x.cue:44:56 2243 2243 + - // ./x.cue:62:25 2244 2244 + - // ./x.cue:70:12 2245 2245 + - // ./x.cue:70:47 2199 2246 + // ./x.cue:22:51 2200 2200 - // ./x.cue:22:52 2201 2201 - // ./x.cue:44:29 2202 2202 - // ./x.cue:44:56 2203 2203 - @@ -1479,7 +462,9 @@ 2247 2247 + + // ./x.cue:22:52 2248 2248 + + // ./x.cue:44:29 2249 2249 + + // ./x.cue:44:56 2250 2250 + + // ./x.cue:62:25 2251 2251 + + // ./x.cue:70:12 2252 2252 + + // ./x.cue:70:47 2253 2253 + + // ./x.cue:75:13 2254 2254 + // ./x.cue:77:13 2255 2255 + // ./x.cue:77:18 2256 2256 + // ./x.cue:96:3 2257 2257 + @@ -1479,7 +473,9 @@ 2204 2258 // ./x.cue:118:38 2205 2259 // ./x.cue:123:9 2206 2260 // ./x.cue:124:16

+17 -11

cue/testdata/eval/sharing.txtar

reviewed

··· 286 286 shareCycle.t2.Y.x: conflicting values int and {x:(#X & Y)} (mismatched types int and struct): 287 287 ./sharecycle.cue:8:6 288 288 ./sharecycle.cue:9:5 289 289 + ./sharecycle.cue:10:6 289 290 ./sharecycle.cue:10:11 290 291 shareCycle.t3.Y.x.x: structural cycle 291 292 ··· 651 652 // [eval] shareCycle.t2.Y.x: conflicting values int and {x:(#X & Y)} (mismatched types int and struct): 652 653 // ./sharecycle.cue:8:6 653 654 // ./sharecycle.cue:9:5 655 655 + // ./sharecycle.cue:10:6 654 656 // ./sharecycle.cue:10:11 655 657 x: (_|_){// (〈1;#X〉 & 〈1;Y〉) 656 658 } ··· 677 679 diff old new 678 680 --- old 679 681 +++ new 680 680 - @@ -4,7 +4,6 @@ 682 682 + @@ -3,8 +3,8 @@ 683 683 + shareCycle.t2.Y.x: conflicting values int and {x:(#X & Y)} (mismatched types int and struct): 681 684 ./sharecycle.cue:8:6 682 685 ./sharecycle.cue:9:5 686 686 + + ./sharecycle.cue:10:6 683 687 ./sharecycle.cue:10:11 684 688 -shareCycle.t2.Y.x.x: structural cycle 685 689 shareCycle.t3.Y.x.x: structural cycle 686 690 687 691 Result: 688 688 - @@ -27,102 +26,75 @@ 692 692 + @@ -27,102 +27,75 @@ 689 693 } 690 694 } 691 695 #Config1: (#struct){ ··· 857 861 } 858 862 Config: (#struct){ 859 863 cfg: (#struct){ 860 860 - @@ -148,24 +120,13 @@ 864 864 + @@ -148,24 +121,13 @@ 861 865 } 862 866 } 863 867 #Config1: (#struct){ ··· 885 889 } 886 890 #Config: (#struct){ 887 891 cfg: (#struct){ 888 888 - @@ -173,12 +134,7 @@ 892 892 + @@ -173,12 +135,7 @@ 889 893 } 890 894 } 891 895 } ··· 899 903 out: (#struct){ 900 904 sch: (#struct){ 901 905 cfg: (#struct){ 902 902 - @@ -247,9 +203,7 @@ 906 906 + @@ -247,9 +204,7 @@ 903 907 } 904 908 debug: (struct){ 905 909 sharingOn: (struct){ ··· 910 914 b: (struct){ 911 915 c: (int){ 1 } 912 916 } 913 913 - @@ -293,14 +247,12 @@ 917 917 + @@ -293,14 +248,12 @@ 914 918 name: (string){ "foo" } 915 919 }, (null){ null }) } 916 920 let _inputList#2 = (#list){ ··· 931 935 } 932 936 _template: (struct){ 933 937 input: (struct){ 934 934 - @@ -324,14 +276,14 @@ 938 938 + @@ -324,14 +277,14 @@ 935 939 name: (string){ "foo" } 936 940 }, (null){ null }) } 937 941 let _inputList#3 = (#list){ ··· 954 958 } 955 959 _template: (struct){ 956 960 input: (struct){ 957 957 - @@ -345,9 +297,13 @@ 961 961 + @@ -345,9 +298,13 @@ 958 962 } 959 963 foo: (struct){ 960 964 input: (struct){ ··· 971 975 } 972 976 } 973 977 } 974 974 - @@ -356,17 +312,13 @@ 978 978 + @@ -356,17 +313,13 @@ 975 979 a: (struct){ 976 980 b: (struct){ 977 981 c: (struct){ ··· 995 999 } 996 1000 Y: (struct){ 997 1001 c: (struct){ 998 998 - @@ -384,10 +336,7 @@ 1002 1002 + @@ -384,10 +337,7 @@ 999 1003 } 1000 1004 } 1001 1005 #Deployment: (#struct){ ··· 1007 1011 } 1008 1012 #ObjectMeta: (#struct){ 1009 1013 name?: (#struct){ 1010 1010 - @@ -420,8 +369,7 @@ 1014 1014 + @@ -419,9 +369,9 @@ 1015 1015 + // [eval] shareCycle.t2.Y.x: conflicting values int and {x:(#X & Y)} (mismatched types int and struct): 1011 1016 // ./sharecycle.cue:8:6 1012 1017 // ./sharecycle.cue:9:5 1018 1018 + + // ./sharecycle.cue:10:6 1013 1019 // ./sharecycle.cue:10:11 1014 1020 - x: (_|_){ 1015 1021 - // [structural cycle] shareCycle.t2.Y.x.x: structural cycle

+12 -1

cue/testdata/fulleval/046_non-structural_direct_cycles.txtar

reviewed

··· 39 39 c2: conflicting values 1 and {bar:1} (mismatched types int and struct): 40 40 ./in.cue:2:5 41 41 ./in.cue:2:16 42 42 + ./in.cue:2:21 42 43 43 44 Result: 44 45 (_|_){ ··· 53 54 // [eval] c2: conflicting values 1 and {bar:1} (mismatched types int and struct): 54 55 // ./in.cue:2:5 55 56 // ./in.cue:2:16 57 57 + // ./in.cue:2:21 56 58 bar: (_|_){// 1 57 59 } 58 60 } ··· 61 63 diff old new 62 64 --- old 63 65 +++ new 64 64 - @@ -16,6 +16,7 @@ 66 66 + @@ -2,6 +2,7 @@ 67 67 + c2: conflicting values 1 and {bar:1} (mismatched types int and struct): 68 68 + ./in.cue:2:5 69 69 + ./in.cue:2:16 70 70 + + ./in.cue:2:21 71 71 + 72 72 + Result: 73 73 + (_|_){ 74 74 + @@ -16,6 +17,8 @@ 65 75 // [eval] c2: conflicting values 1 and {bar:1} (mismatched types int and struct): 66 76 // ./in.cue:2:5 67 77 // ./in.cue:2:16 68 78 - bar: (int){ 1 } 79 79 + + // ./in.cue:2:21 69 80 + bar: (_|_){// 1 70 81 + } 71 82 }

+1 -1

encoding/jsonschema/testdata/external/tests/draft2019-09/propertyNames.json

reviewed

··· 158 158 "data": {}, 159 159 "valid": true, 160 160 "skip": { 161 161 - "v3": "6 errors in empty disjunction:\nconflicting values [...] and {} (mismatched types list and struct):\n generated.cue:3:33\n instance.json:1:1\nconflicting values bool and {} (mismatched types bool and struct):\n generated.cue:3:8\n instance.json:1:1\nconflicting values null and {} (mismatched types null and struct):\n generated.cue:3:1\n instance.json:1:1\nconflicting values number and {} (mismatched types number and struct):\n generated.cue:3:15\n instance.json:1:1\nconflicting values string and {} (mismatched types string and struct):\n generated.cue:3:24\n instance.json:1:1\nexplicit error (_|_ literal) in source:\n generated.cue:4:3\n" 161 161 + "v3": "6 errors in empty disjunction:\nconflicting values [...] and {} (mismatched types list and struct):\n generated.cue:3:1\n generated.cue:3:33\n instance.json:1:1\nconflicting values bool and {} (mismatched types bool and struct):\n generated.cue:3:1\n generated.cue:3:8\n instance.json:1:1\nconflicting values null and {} (mismatched types null and struct):\n generated.cue:3:1\n instance.json:1:1\nconflicting values number and {} (mismatched types number and struct):\n generated.cue:3:1\n generated.cue:3:15\n instance.json:1:1\nconflicting values string and {} (mismatched types string and struct):\n generated.cue:3:1\n generated.cue:3:24\n instance.json:1:1\nexplicit error (_|_ literal) in source:\n generated.cue:4:3\n" 162 162 } 163 163 } 164 164 ]

+1 -1

encoding/jsonschema/testdata/external/tests/draft2020-12/propertyNames.json

reviewed

··· 122 122 "data": {}, 123 123 "valid": true, 124 124 "skip": { 125 125 - "v3": "6 errors in empty disjunction:\nconflicting values [...] and {} (mismatched types list and struct):\n generated.cue:3:33\n instance.json:1:1\nconflicting values bool and {} (mismatched types bool and struct):\n generated.cue:3:8\n instance.json:1:1\nconflicting values null and {} (mismatched types null and struct):\n generated.cue:3:1\n instance.json:1:1\nconflicting values number and {} (mismatched types number and struct):\n generated.cue:3:15\n instance.json:1:1\nconflicting values string and {} (mismatched types string and struct):\n generated.cue:3:24\n instance.json:1:1\nexplicit error (_|_ literal) in source:\n generated.cue:4:3\n" 125 125 + "v3": "6 errors in empty disjunction:\nconflicting values [...] and {} (mismatched types list and struct):\n generated.cue:3:1\n generated.cue:3:33\n instance.json:1:1\nconflicting values bool and {} (mismatched types bool and struct):\n generated.cue:3:1\n generated.cue:3:8\n instance.json:1:1\nconflicting values null and {} (mismatched types null and struct):\n generated.cue:3:1\n instance.json:1:1\nconflicting values number and {} (mismatched types number and struct):\n generated.cue:3:1\n generated.cue:3:15\n instance.json:1:1\nconflicting values string and {} (mismatched types string and struct):\n generated.cue:3:1\n generated.cue:3:24\n instance.json:1:1\nexplicit error (_|_ literal) in source:\n generated.cue:4:3\n" 126 126 } 127 127 } 128 128 ]

+1 -1

encoding/jsonschema/testdata/external/tests/draft6/propertyNames.json

reviewed

··· 154 154 "data": {}, 155 155 "valid": true, 156 156 "skip": { 157 157 - "v3": "6 errors in empty disjunction:\nconflicting values [...] and {} (mismatched types list and struct):\n generated.cue:2:33\n instance.json:1:1\nconflicting values bool and {} (mismatched types bool and struct):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and {} (mismatched types null and struct):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and {} (mismatched types number and struct):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and {} (mismatched types string and struct):\n generated.cue:2:24\n instance.json:1:1\nexplicit error (_|_ literal) in source:\n generated.cue:3:3\n" 157 157 + "v3": "6 errors in empty disjunction:\nconflicting values [...] and {} (mismatched types list and struct):\n generated.cue:2:1\n generated.cue:2:33\n instance.json:1:1\nconflicting values bool and {} (mismatched types bool and struct):\n generated.cue:2:1\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and {} (mismatched types null and struct):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and {} (mismatched types number and struct):\n generated.cue:2:1\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and {} (mismatched types string and struct):\n generated.cue:2:1\n generated.cue:2:24\n instance.json:1:1\nexplicit error (_|_ literal) in source:\n generated.cue:3:3\n" 158 158 } 159 159 } 160 160 ]

+1 -1

encoding/jsonschema/testdata/external/tests/draft7/propertyNames.json

reviewed

··· 154 154 "data": {}, 155 155 "valid": true, 156 156 "skip": { 157 157 - "v3": "6 errors in empty disjunction:\nconflicting values [...] and {} (mismatched types list and struct):\n generated.cue:2:33\n instance.json:1:1\nconflicting values bool and {} (mismatched types bool and struct):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and {} (mismatched types null and struct):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and {} (mismatched types number and struct):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and {} (mismatched types string and struct):\n generated.cue:2:24\n instance.json:1:1\nexplicit error (_|_ literal) in source:\n generated.cue:3:3\n" 157 157 + "v3": "6 errors in empty disjunction:\nconflicting values [...] and {} (mismatched types list and struct):\n generated.cue:2:1\n generated.cue:2:33\n instance.json:1:1\nconflicting values bool and {} (mismatched types bool and struct):\n generated.cue:2:1\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and {} (mismatched types null and struct):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and {} (mismatched types number and struct):\n generated.cue:2:1\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and {} (mismatched types string and struct):\n generated.cue:2:1\n generated.cue:2:24\n instance.json:1:1\nexplicit error (_|_ literal) in source:\n generated.cue:3:3\n" 158 158 } 159 159 } 160 160 ]

+1

internal/core/adt/eval.go

reviewed

··· 689 689 n.kindExpr = v 690 690 } 691 691 n.kind = kind 692 692 + n.kindID = id 692 693 return kind != BottomKind 693 694 } 694 695

+1 -1

pkg/crypto/ed25519/testdata/gen.txtar

reviewed

··· 7 7 t1: ed25519.Valid(hex.Decode("3b6a27bcceb6a42d62a3a8d02a6f0d73653215771de243a63ac048a18b59da29"), hex.Decode("6d657373616765206d69736d61746368"), hex.Decode("708335b88a198dc75e7071b0b673a02c2cfff52d8d5a617a6a2de2cc487ba344ea832cb0b77383edad5651e75d397c3757d105c75e946bf04f2fcb38fdadce00")) 8 8 t2: ed25519.Valid(hex.Decode("0000000000000000000000000000000000000000000000000000000000000000"), hex.Decode("77726f6e67206b6579"), hex.Decode("f4c5e79897560f64bbe351c0d00c4e47d74c5393a20ac8056f54213b492963f98572ccb22f787fcc764f7e993bdd34e7f13ff8487ffc1dd647fce74b1093eb04")) 9 9 t3: ed25519.Valid(hex.Decode(""), hex.Decode("77726f6e67206b65792073697a65"), hex.Decode("34b7fe250b3ddfb1ba7e56aca7e869a59c5208315f705323c4b3abf915c2a8c07537417bd988b0144929f52b1d00eb768741e7e139dca10412ae1997b6644c09")) 10 10 - -- out/ed25519 -- 10 10 + -- out/ed25519-v3 -- 11 11 Errors: 12 12 t3: error in call to crypto/ed25519.Valid: ed25519: publicKey must be 32 bytes: 13 13 ./in.cue:8:5