@hew-lang/tree-sitter-hew 1.1.1 → 1.2.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/src/grammar.json CHANGED
@@ -90,6 +90,14 @@
90
90
  {
91
91
  "type": "SYMBOL",
92
92
  "name": "type_alias"
93
+ },
94
+ {
95
+ "type": "SYMBOL",
96
+ "name": "macro_declaration"
97
+ },
98
+ {
99
+ "type": "SYMBOL",
100
+ "name": "macro_invocation"
93
101
  }
94
102
  ]
95
103
  }
@@ -107,8 +115,32 @@
107
115
  "value": "["
108
116
  },
109
117
  {
110
- "type": "SYMBOL",
111
- "name": "identifier"
118
+ "type": "FIELD",
119
+ "name": "name",
120
+ "content": {
121
+ "type": "SYMBOL",
122
+ "name": "identifier"
123
+ }
124
+ },
125
+ {
126
+ "type": "REPEAT",
127
+ "content": {
128
+ "type": "SEQ",
129
+ "members": [
130
+ {
131
+ "type": "STRING",
132
+ "value": "."
133
+ },
134
+ {
135
+ "type": "FIELD",
136
+ "name": "name",
137
+ "content": {
138
+ "type": "SYMBOL",
139
+ "name": "identifier"
140
+ }
141
+ }
142
+ ]
143
+ }
112
144
  },
113
145
  {
114
146
  "type": "CHOICE",
@@ -121,37 +153,11 @@
121
153
  "value": "("
122
154
  },
123
155
  {
124
- "type": "CHOICE",
125
- "members": [
126
- {
127
- "type": "SEQ",
128
- "members": [
129
- {
130
- "type": "SYMBOL",
131
- "name": "_attribute_arg"
132
- },
133
- {
134
- "type": "REPEAT",
135
- "content": {
136
- "type": "SEQ",
137
- "members": [
138
- {
139
- "type": "STRING",
140
- "value": ","
141
- },
142
- {
143
- "type": "SYMBOL",
144
- "name": "_attribute_arg"
145
- }
146
- ]
147
- }
148
- }
149
- ]
150
- },
151
- {
152
- "type": "BLANK"
153
- }
154
- ]
156
+ "type": "REPEAT",
157
+ "content": {
158
+ "type": "SYMBOL",
159
+ "name": "_macro_token"
160
+ }
155
161
  },
156
162
  {
157
163
  "type": "STRING",
@@ -170,55 +176,559 @@
170
176
  }
171
177
  ]
172
178
  },
173
- "_attribute_arg": {
174
- "type": "CHOICE",
179
+ "macro_declaration": {
180
+ "type": "SEQ",
175
181
  "members": [
176
182
  {
177
- "type": "SEQ",
183
+ "type": "STRING",
184
+ "value": "macro"
185
+ },
186
+ {
187
+ "type": "FIELD",
188
+ "name": "name",
189
+ "content": {
190
+ "type": "SYMBOL",
191
+ "name": "identifier"
192
+ }
193
+ },
194
+ {
195
+ "type": "STRING",
196
+ "value": "{"
197
+ },
198
+ {
199
+ "type": "REPEAT1",
200
+ "content": {
201
+ "type": "SYMBOL",
202
+ "name": "macro_rule"
203
+ }
204
+ },
205
+ {
206
+ "type": "STRING",
207
+ "value": "}"
208
+ }
209
+ ]
210
+ },
211
+ "macro_rule": {
212
+ "type": "SEQ",
213
+ "members": [
214
+ {
215
+ "type": "CHOICE",
178
216
  "members": [
179
217
  {
180
- "type": "SYMBOL",
181
- "name": "identifier"
182
- },
183
- {
184
- "type": "STRING",
185
- "value": "="
218
+ "type": "FIELD",
219
+ "name": "pattern",
220
+ "content": {
221
+ "type": "SYMBOL",
222
+ "name": "macro_pattern"
223
+ }
186
224
  },
187
225
  {
188
- "type": "CHOICE",
226
+ "type": "SEQ",
189
227
  "members": [
190
228
  {
191
- "type": "SYMBOL",
192
- "name": "identifier"
229
+ "type": "STRING",
230
+ "value": "#"
231
+ },
232
+ {
233
+ "type": "STRING",
234
+ "value": "["
235
+ },
236
+ {
237
+ "type": "FIELD",
238
+ "name": "pattern",
239
+ "content": {
240
+ "type": "SYMBOL",
241
+ "name": "macro_pattern"
242
+ }
243
+ },
244
+ {
245
+ "type": "STRING",
246
+ "value": "]"
193
247
  },
194
248
  {
195
249
  "type": "SYMBOL",
196
- "name": "_literal"
250
+ "name": "macro_function_capture"
197
251
  }
198
252
  ]
199
253
  }
200
254
  ]
201
255
  },
256
+ {
257
+ "type": "STRING",
258
+ "value": "=>"
259
+ },
260
+ {
261
+ "type": "FIELD",
262
+ "name": "category",
263
+ "content": {
264
+ "type": "CHOICE",
265
+ "members": [
266
+ {
267
+ "type": "STRING",
268
+ "value": "expr"
269
+ },
270
+ {
271
+ "type": "STRING",
272
+ "value": "items"
273
+ }
274
+ ]
275
+ }
276
+ },
277
+ {
278
+ "type": "FIELD",
279
+ "name": "template",
280
+ "content": {
281
+ "type": "SYMBOL",
282
+ "name": "macro_template"
283
+ }
284
+ }
285
+ ]
286
+ },
287
+ "macro_pattern": {
288
+ "type": "SEQ",
289
+ "members": [
290
+ {
291
+ "type": "STRING",
292
+ "value": "("
293
+ },
294
+ {
295
+ "type": "REPEAT",
296
+ "content": {
297
+ "type": "SYMBOL",
298
+ "name": "_macro_token"
299
+ }
300
+ },
301
+ {
302
+ "type": "STRING",
303
+ "value": ")"
304
+ }
305
+ ]
306
+ },
307
+ "macro_template": {
308
+ "type": "SEQ",
309
+ "members": [
310
+ {
311
+ "type": "STRING",
312
+ "value": "{"
313
+ },
314
+ {
315
+ "type": "REPEAT",
316
+ "content": {
317
+ "type": "SYMBOL",
318
+ "name": "_macro_token"
319
+ }
320
+ },
321
+ {
322
+ "type": "STRING",
323
+ "value": "}"
324
+ }
325
+ ]
326
+ },
327
+ "macro_function_capture": {
328
+ "type": "SEQ",
329
+ "members": [
330
+ {
331
+ "type": "SYMBOL",
332
+ "name": "macro_variable"
333
+ },
334
+ {
335
+ "type": "STRING",
336
+ "value": ":"
337
+ },
338
+ {
339
+ "type": "CHOICE",
340
+ "members": [
341
+ {
342
+ "type": "STRING",
343
+ "value": "fn"
344
+ },
345
+ {
346
+ "type": "STRING",
347
+ "value": "method"
348
+ }
349
+ ]
350
+ },
351
+ {
352
+ "type": "CHOICE",
353
+ "members": [
354
+ {
355
+ "type": "STRING",
356
+ "value": "fails"
357
+ },
358
+ {
359
+ "type": "BLANK"
360
+ }
361
+ ]
362
+ }
363
+ ]
364
+ },
365
+ "macro_variable": {
366
+ "type": "PREC",
367
+ "value": 1,
368
+ "content": {
369
+ "type": "SEQ",
370
+ "members": [
371
+ {
372
+ "type": "STRING",
373
+ "value": "$"
374
+ },
375
+ {
376
+ "type": "SYMBOL",
377
+ "name": "identifier"
378
+ }
379
+ ]
380
+ }
381
+ },
382
+ "token_tree": {
383
+ "type": "CHOICE",
384
+ "members": [
202
385
  {
203
386
  "type": "SEQ",
204
387
  "members": [
205
388
  {
206
- "type": "SYMBOL",
207
- "name": "integer_literal"
389
+ "type": "STRING",
390
+ "value": "("
208
391
  },
209
392
  {
210
- "type": "SYMBOL",
211
- "name": "identifier"
393
+ "type": "REPEAT",
394
+ "content": {
395
+ "type": "SYMBOL",
396
+ "name": "_macro_token"
397
+ }
398
+ },
399
+ {
400
+ "type": "STRING",
401
+ "value": ")"
402
+ }
403
+ ]
404
+ },
405
+ {
406
+ "type": "SEQ",
407
+ "members": [
408
+ {
409
+ "type": "STRING",
410
+ "value": "["
411
+ },
412
+ {
413
+ "type": "REPEAT",
414
+ "content": {
415
+ "type": "SYMBOL",
416
+ "name": "_macro_token"
417
+ }
418
+ },
419
+ {
420
+ "type": "STRING",
421
+ "value": "]"
422
+ }
423
+ ]
424
+ },
425
+ {
426
+ "type": "SEQ",
427
+ "members": [
428
+ {
429
+ "type": "STRING",
430
+ "value": "{"
431
+ },
432
+ {
433
+ "type": "REPEAT",
434
+ "content": {
435
+ "type": "SYMBOL",
436
+ "name": "_macro_token"
437
+ }
438
+ },
439
+ {
440
+ "type": "STRING",
441
+ "value": "}"
212
442
  }
213
443
  ]
444
+ }
445
+ ]
446
+ },
447
+ "_macro_token": {
448
+ "type": "CHOICE",
449
+ "members": [
450
+ {
451
+ "type": "SYMBOL",
452
+ "name": "token_tree"
453
+ },
454
+ {
455
+ "type": "SYMBOL",
456
+ "name": "macro_variable"
457
+ },
458
+ {
459
+ "type": "SYMBOL",
460
+ "name": "identifier"
461
+ },
462
+ {
463
+ "type": "SYMBOL",
464
+ "name": "_literal"
465
+ },
466
+ {
467
+ "type": "ALIAS",
468
+ "content": {
469
+ "type": "SYMBOL",
470
+ "name": "macro_interpolated_string"
471
+ },
472
+ "named": true,
473
+ "value": "interpolated_string"
474
+ },
475
+ {
476
+ "type": "STRING",
477
+ "value": ","
478
+ },
479
+ {
480
+ "type": "STRING",
481
+ "value": ";"
482
+ },
483
+ {
484
+ "type": "STRING",
485
+ "value": ":"
486
+ },
487
+ {
488
+ "type": "STRING",
489
+ "value": "."
490
+ },
491
+ {
492
+ "type": "STRING",
493
+ "value": "@"
494
+ },
495
+ {
496
+ "type": "STRING",
497
+ "value": "#"
498
+ },
499
+ {
500
+ "type": "STRING",
501
+ "value": "$"
502
+ },
503
+ {
504
+ "type": "STRING",
505
+ "value": "+"
506
+ },
507
+ {
508
+ "type": "STRING",
509
+ "value": "-"
510
+ },
511
+ {
512
+ "type": "STRING",
513
+ "value": "*"
514
+ },
515
+ {
516
+ "type": "STRING",
517
+ "value": "/"
518
+ },
519
+ {
520
+ "type": "STRING",
521
+ "value": "%"
522
+ },
523
+ {
524
+ "type": "STRING",
525
+ "value": "!"
526
+ },
527
+ {
528
+ "type": "STRING",
529
+ "value": "~"
530
+ },
531
+ {
532
+ "type": "STRING",
533
+ "value": "&"
534
+ },
535
+ {
536
+ "type": "STRING",
537
+ "value": "|"
538
+ },
539
+ {
540
+ "type": "STRING",
541
+ "value": "^"
542
+ },
543
+ {
544
+ "type": "STRING",
545
+ "value": "="
546
+ },
547
+ {
548
+ "type": "STRING",
549
+ "value": "<"
550
+ },
551
+ {
552
+ "type": "STRING",
553
+ "value": ">"
554
+ },
555
+ {
556
+ "type": "STRING",
557
+ "value": "?"
558
+ },
559
+ {
560
+ "type": "STRING",
561
+ "value": "??"
562
+ },
563
+ {
564
+ "type": "STRING",
565
+ "value": "?."
566
+ },
567
+ {
568
+ "type": "STRING",
569
+ "value": "=>"
570
+ },
571
+ {
572
+ "type": "STRING",
573
+ "value": "->"
574
+ },
575
+ {
576
+ "type": "STRING",
577
+ "value": ".."
578
+ },
579
+ {
580
+ "type": "STRING",
581
+ "value": "..="
582
+ },
583
+ {
584
+ "type": "STRING",
585
+ "value": "=="
586
+ },
587
+ {
588
+ "type": "STRING",
589
+ "value": "!="
590
+ },
591
+ {
592
+ "type": "STRING",
593
+ "value": "<="
594
+ },
595
+ {
596
+ "type": "STRING",
597
+ "value": ">="
598
+ },
599
+ {
600
+ "type": "STRING",
601
+ "value": "&&"
602
+ },
603
+ {
604
+ "type": "STRING",
605
+ "value": "||"
606
+ },
607
+ {
608
+ "type": "STRING",
609
+ "value": "<<"
610
+ },
611
+ {
612
+ "type": "STRING",
613
+ "value": ">>"
614
+ },
615
+ {
616
+ "type": "STRING",
617
+ "value": "+="
618
+ },
619
+ {
620
+ "type": "STRING",
621
+ "value": "-="
622
+ },
623
+ {
624
+ "type": "STRING",
625
+ "value": "*="
626
+ },
627
+ {
628
+ "type": "STRING",
629
+ "value": "/="
630
+ },
631
+ {
632
+ "type": "STRING",
633
+ "value": "%="
634
+ },
635
+ {
636
+ "type": "STRING",
637
+ "value": "&="
638
+ },
639
+ {
640
+ "type": "STRING",
641
+ "value": "|="
642
+ },
643
+ {
644
+ "type": "STRING",
645
+ "value": "^="
646
+ },
647
+ {
648
+ "type": "STRING",
649
+ "value": "<<="
650
+ },
651
+ {
652
+ "type": "STRING",
653
+ "value": ">>="
654
+ },
655
+ {
656
+ "type": "STRING",
657
+ "value": "&+"
658
+ },
659
+ {
660
+ "type": "STRING",
661
+ "value": "&-"
662
+ },
663
+ {
664
+ "type": "STRING",
665
+ "value": "&*"
666
+ }
667
+ ]
668
+ },
669
+ "macro_interpolated_string": {
670
+ "type": "SEQ",
671
+ "members": [
672
+ {
673
+ "type": "SYMBOL",
674
+ "name": "fstring_start"
675
+ },
676
+ {
677
+ "type": "REPEAT",
678
+ "content": {
679
+ "type": "CHOICE",
680
+ "members": [
681
+ {
682
+ "type": "ALIAS",
683
+ "content": {
684
+ "type": "SYMBOL",
685
+ "name": "interpolated_string_content"
686
+ },
687
+ "named": true,
688
+ "value": "string_content"
689
+ },
690
+ {
691
+ "type": "SYMBOL",
692
+ "name": "escape_sequence"
693
+ },
694
+ {
695
+ "type": "ALIAS",
696
+ "content": {
697
+ "type": "SYMBOL",
698
+ "name": "macro_interpolation"
699
+ },
700
+ "named": true,
701
+ "value": "interpolation"
702
+ }
703
+ ]
704
+ }
705
+ },
706
+ {
707
+ "type": "STRING",
708
+ "value": "\""
709
+ }
710
+ ]
711
+ },
712
+ "macro_interpolation": {
713
+ "type": "SEQ",
714
+ "members": [
715
+ {
716
+ "type": "IMMEDIATE_TOKEN",
717
+ "content": {
718
+ "type": "STRING",
719
+ "value": "{"
720
+ }
214
721
  },
215
722
  {
216
- "type": "SYMBOL",
217
- "name": "identifier"
723
+ "type": "REPEAT",
724
+ "content": {
725
+ "type": "SYMBOL",
726
+ "name": "_macro_token"
727
+ }
218
728
  },
219
729
  {
220
- "type": "SYMBOL",
221
- "name": "_literal"
730
+ "type": "STRING",
731
+ "value": "}"
222
732
  }
223
733
  ]
224
734
  },
@@ -851,8 +1361,25 @@
851
1361
  "type": "CHOICE",
852
1362
  "members": [
853
1363
  {
854
- "type": "STRING",
855
- "value": ";"
1364
+ "type": "SEQ",
1365
+ "members": [
1366
+ {
1367
+ "type": "CHOICE",
1368
+ "members": [
1369
+ {
1370
+ "type": "SYMBOL",
1371
+ "name": "variant_tag"
1372
+ },
1373
+ {
1374
+ "type": "BLANK"
1375
+ }
1376
+ ]
1377
+ },
1378
+ {
1379
+ "type": "STRING",
1380
+ "value": ";"
1381
+ }
1382
+ ]
856
1383
  },
857
1384
  {
858
1385
  "type": "SEQ",
@@ -902,6 +1429,18 @@
902
1429
  "type": "STRING",
903
1430
  "value": ")"
904
1431
  },
1432
+ {
1433
+ "type": "CHOICE",
1434
+ "members": [
1435
+ {
1436
+ "type": "SYMBOL",
1437
+ "name": "variant_tag"
1438
+ },
1439
+ {
1440
+ "type": "BLANK"
1441
+ }
1442
+ ]
1443
+ },
905
1444
  {
906
1445
  "type": "STRING",
907
1446
  "value": ";"
@@ -925,6 +1464,27 @@
925
1464
  {
926
1465
  "type": "STRING",
927
1466
  "value": "}"
1467
+ },
1468
+ {
1469
+ "type": "CHOICE",
1470
+ "members": [
1471
+ {
1472
+ "type": "SEQ",
1473
+ "members": [
1474
+ {
1475
+ "type": "SYMBOL",
1476
+ "name": "variant_tag"
1477
+ },
1478
+ {
1479
+ "type": "STRING",
1480
+ "value": ";"
1481
+ }
1482
+ ]
1483
+ },
1484
+ {
1485
+ "type": "BLANK"
1486
+ }
1487
+ ]
928
1488
  }
929
1489
  ]
930
1490
  }
@@ -932,6 +1492,19 @@
932
1492
  }
933
1493
  ]
934
1494
  },
1495
+ "variant_tag": {
1496
+ "type": "SEQ",
1497
+ "members": [
1498
+ {
1499
+ "type": "STRING",
1500
+ "value": "@"
1501
+ },
1502
+ {
1503
+ "type": "SYMBOL",
1504
+ "name": "integer_literal"
1505
+ }
1506
+ ]
1507
+ },
935
1508
  "reserved_declaration": {
936
1509
  "type": "SEQ",
937
1510
  "members": [
@@ -1203,6 +1776,18 @@
1203
1776
  "type": "STRING",
1204
1777
  "value": "fn"
1205
1778
  },
1779
+ {
1780
+ "type": "CHOICE",
1781
+ "members": [
1782
+ {
1783
+ "type": "SYMBOL",
1784
+ "name": "trait_method_effect"
1785
+ },
1786
+ {
1787
+ "type": "BLANK"
1788
+ }
1789
+ ]
1790
+ },
1206
1791
  {
1207
1792
  "type": "FIELD",
1208
1793
  "name": "name",
@@ -1286,6 +1871,23 @@
1286
1871
  }
1287
1872
  ]
1288
1873
  },
1874
+ "trait_method_effect": {
1875
+ "type": "SEQ",
1876
+ "members": [
1877
+ {
1878
+ "type": "STRING",
1879
+ "value": "["
1880
+ },
1881
+ {
1882
+ "type": "STRING",
1883
+ "value": "suspends"
1884
+ },
1885
+ {
1886
+ "type": "STRING",
1887
+ "value": "]"
1888
+ }
1889
+ ]
1890
+ },
1289
1891
  "associated_type": {
1290
1892
  "type": "SEQ",
1291
1893
  "members": [
@@ -1771,27 +2373,36 @@
1771
2373
  "type": "PREC_RIGHT",
1772
2374
  "value": 0,
1773
2375
  "content": {
1774
- "type": "SEQ",
2376
+ "type": "CHOICE",
1775
2377
  "members": [
1776
2378
  {
1777
- "type": "STRING",
1778
- "value": "->"
1779
- },
1780
- {
1781
- "type": "SYMBOL",
1782
- "name": "_type"
1783
- },
1784
- {
1785
- "type": "CHOICE",
2379
+ "type": "SEQ",
1786
2380
  "members": [
2381
+ {
2382
+ "type": "STRING",
2383
+ "value": "->"
2384
+ },
1787
2385
  {
1788
2386
  "type": "SYMBOL",
1789
- "name": "failure_return"
2387
+ "name": "_type"
1790
2388
  },
1791
2389
  {
1792
- "type": "BLANK"
2390
+ "type": "CHOICE",
2391
+ "members": [
2392
+ {
2393
+ "type": "SYMBOL",
2394
+ "name": "failure_return"
2395
+ },
2396
+ {
2397
+ "type": "BLANK"
2398
+ }
2399
+ ]
1793
2400
  }
1794
2401
  ]
2402
+ },
2403
+ {
2404
+ "type": "SYMBOL",
2405
+ "name": "failure_return"
1795
2406
  }
1796
2407
  ]
1797
2408
  }
@@ -2548,62 +3159,8 @@
2548
3159
  "type": "CHOICE",
2549
3160
  "members": [
2550
3161
  {
2551
- "type": "SEQ",
2552
- "members": [
2553
- {
2554
- "type": "STRING",
2555
- "value": "("
2556
- },
2557
- {
2558
- "type": "CHOICE",
2559
- "members": [
2560
- {
2561
- "type": "SEQ",
2562
- "members": [
2563
- {
2564
- "type": "SYMBOL",
2565
- "name": "call_argument"
2566
- },
2567
- {
2568
- "type": "REPEAT",
2569
- "content": {
2570
- "type": "SEQ",
2571
- "members": [
2572
- {
2573
- "type": "STRING",
2574
- "value": ","
2575
- },
2576
- {
2577
- "type": "SYMBOL",
2578
- "name": "call_argument"
2579
- }
2580
- ]
2581
- }
2582
- }
2583
- ]
2584
- },
2585
- {
2586
- "type": "BLANK"
2587
- }
2588
- ]
2589
- },
2590
- {
2591
- "type": "CHOICE",
2592
- "members": [
2593
- {
2594
- "type": "STRING",
2595
- "value": ","
2596
- },
2597
- {
2598
- "type": "BLANK"
2599
- }
2600
- ]
2601
- },
2602
- {
2603
- "type": "STRING",
2604
- "value": ")"
2605
- }
2606
- ]
3162
+ "type": "SYMBOL",
3163
+ "name": "spawn_keys"
2607
3164
  },
2608
3165
  {
2609
3166
  "type": "BLANK"
@@ -3133,7 +3690,7 @@
3133
3690
  "members": [
3134
3691
  {
3135
3692
  "type": "STRING",
3136
- "value": "("
3693
+ "value": "{"
3137
3694
  },
3138
3695
  {
3139
3696
  "type": "FIELD",
@@ -3164,9 +3721,21 @@
3164
3721
  ]
3165
3722
  }
3166
3723
  },
3724
+ {
3725
+ "type": "CHOICE",
3726
+ "members": [
3727
+ {
3728
+ "type": "STRING",
3729
+ "value": ","
3730
+ },
3731
+ {
3732
+ "type": "BLANK"
3733
+ }
3734
+ ]
3735
+ },
3167
3736
  {
3168
3737
  "type": "STRING",
3169
- "value": ")"
3738
+ "value": "}"
3170
3739
  }
3171
3740
  ]
3172
3741
  },
@@ -3228,8 +3797,29 @@
3228
3797
  "type": "CHOICE",
3229
3798
  "members": [
3230
3799
  {
3231
- "type": "SYMBOL",
3232
- "name": "identifier"
3800
+ "type": "SEQ",
3801
+ "members": [
3802
+ {
3803
+ "type": "SYMBOL",
3804
+ "name": "identifier"
3805
+ },
3806
+ {
3807
+ "type": "REPEAT",
3808
+ "content": {
3809
+ "type": "SEQ",
3810
+ "members": [
3811
+ {
3812
+ "type": "STRING",
3813
+ "value": "."
3814
+ },
3815
+ {
3816
+ "type": "SYMBOL",
3817
+ "name": "identifier"
3818
+ }
3819
+ ]
3820
+ }
3821
+ }
3822
+ ]
3233
3823
  },
3234
3824
  {
3235
3825
  "type": "SYMBOL",
@@ -3297,39 +3887,117 @@
3297
3887
  "value": "{"
3298
3888
  },
3299
3889
  {
3300
- "type": "SEQ",
3890
+ "type": "CHOICE",
3301
3891
  "members": [
3302
3892
  {
3303
- "type": "SYMBOL",
3304
- "name": "field_initializer"
3305
- },
3306
- {
3307
- "type": "REPEAT",
3308
- "content": {
3309
- "type": "SEQ",
3310
- "members": [
3311
- {
3312
- "type": "STRING",
3313
- "value": ","
3314
- },
3315
- {
3893
+ "type": "SEQ",
3894
+ "members": [
3895
+ {
3896
+ "type": "ALIAS",
3897
+ "content": {
3316
3898
  "type": "SYMBOL",
3317
- "name": "field_initializer"
3899
+ "name": "_written_field_initializer"
3900
+ },
3901
+ "named": true,
3902
+ "value": "field_initializer"
3903
+ },
3904
+ {
3905
+ "type": "REPEAT",
3906
+ "content": {
3907
+ "type": "SEQ",
3908
+ "members": [
3909
+ {
3910
+ "type": "STRING",
3911
+ "value": ","
3912
+ },
3913
+ {
3914
+ "type": "SYMBOL",
3915
+ "name": "field_initializer"
3916
+ }
3917
+ ]
3318
3918
  }
3319
- ]
3320
- }
3321
- }
3322
- ]
3323
- },
3324
- {
3325
- "type": "CHOICE",
3326
- "members": [
3327
- {
3328
- "type": "STRING",
3329
- "value": ","
3919
+ },
3920
+ {
3921
+ "type": "CHOICE",
3922
+ "members": [
3923
+ {
3924
+ "type": "STRING",
3925
+ "value": ","
3926
+ },
3927
+ {
3928
+ "type": "BLANK"
3929
+ }
3930
+ ]
3931
+ }
3932
+ ]
3330
3933
  },
3331
3934
  {
3332
- "type": "BLANK"
3935
+ "type": "SEQ",
3936
+ "members": [
3937
+ {
3938
+ "type": "ALIAS",
3939
+ "content": {
3940
+ "type": "SYMBOL",
3941
+ "name": "_shorthand_field_initializer"
3942
+ },
3943
+ "named": true,
3944
+ "value": "field_initializer"
3945
+ },
3946
+ {
3947
+ "type": "STRING",
3948
+ "value": ","
3949
+ },
3950
+ {
3951
+ "type": "CHOICE",
3952
+ "members": [
3953
+ {
3954
+ "type": "SEQ",
3955
+ "members": [
3956
+ {
3957
+ "type": "SEQ",
3958
+ "members": [
3959
+ {
3960
+ "type": "SYMBOL",
3961
+ "name": "field_initializer"
3962
+ },
3963
+ {
3964
+ "type": "REPEAT",
3965
+ "content": {
3966
+ "type": "SEQ",
3967
+ "members": [
3968
+ {
3969
+ "type": "STRING",
3970
+ "value": ","
3971
+ },
3972
+ {
3973
+ "type": "SYMBOL",
3974
+ "name": "field_initializer"
3975
+ }
3976
+ ]
3977
+ }
3978
+ }
3979
+ ]
3980
+ },
3981
+ {
3982
+ "type": "CHOICE",
3983
+ "members": [
3984
+ {
3985
+ "type": "STRING",
3986
+ "value": ","
3987
+ },
3988
+ {
3989
+ "type": "BLANK"
3990
+ }
3991
+ ]
3992
+ }
3993
+ ]
3994
+ },
3995
+ {
3996
+ "type": "BLANK"
3997
+ }
3998
+ ]
3999
+ }
4000
+ ]
3333
4001
  }
3334
4002
  ]
3335
4003
  },
@@ -3819,6 +4487,22 @@
3819
4487
  "type": "SYMBOL",
3820
4488
  "name": "identifier"
3821
4489
  },
4490
+ {
4491
+ "type": "REPEAT",
4492
+ "content": {
4493
+ "type": "SEQ",
4494
+ "members": [
4495
+ {
4496
+ "type": "STRING",
4497
+ "value": "."
4498
+ },
4499
+ {
4500
+ "type": "SYMBOL",
4501
+ "name": "identifier"
4502
+ }
4503
+ ]
4504
+ }
4505
+ },
3822
4506
  {
3823
4507
  "type": "CHOICE",
3824
4508
  "members": [
@@ -4055,8 +4739,22 @@
4055
4739
  "type": "SEQ",
4056
4740
  "members": [
4057
4741
  {
4058
- "type": "SYMBOL",
4059
- "name": "identifier"
4742
+ "type": "CHOICE",
4743
+ "members": [
4744
+ {
4745
+ "type": "SYMBOL",
4746
+ "name": "identifier"
4747
+ },
4748
+ {
4749
+ "type": "ALIAS",
4750
+ "content": {
4751
+ "type": "SYMBOL",
4752
+ "name": "primitive_type"
4753
+ },
4754
+ "named": true,
4755
+ "value": "identifier"
4756
+ }
4757
+ ]
4060
4758
  },
4061
4759
  {
4062
4760
  "type": "REPEAT1",
@@ -4236,6 +4934,18 @@
4236
4934
  }
4237
4935
  ]
4238
4936
  },
4937
+ {
4938
+ "type": "CHOICE",
4939
+ "members": [
4940
+ {
4941
+ "type": "SYMBOL",
4942
+ "name": "type_parameters"
4943
+ },
4944
+ {
4945
+ "type": "BLANK"
4946
+ }
4947
+ ]
4948
+ },
4239
4949
  {
4240
4950
  "type": "STRING",
4241
4951
  "value": "("
@@ -4518,12 +5228,33 @@
4518
5228
  "name": "_statement"
4519
5229
  }
4520
5230
  },
5231
+ {
5232
+ "type": "CHOICE",
5233
+ "members": [
5234
+ {
5235
+ "type": "ALIAS",
5236
+ "content": {
5237
+ "type": "SYMBOL",
5238
+ "name": "_tail_expression"
5239
+ },
5240
+ "named": true,
5241
+ "value": "expression_statement"
5242
+ },
5243
+ {
5244
+ "type": "BLANK"
5245
+ }
5246
+ ]
5247
+ },
4521
5248
  {
4522
5249
  "type": "STRING",
4523
5250
  "value": "}"
4524
5251
  }
4525
5252
  ]
4526
5253
  },
5254
+ "_tail_expression": {
5255
+ "type": "SYMBOL",
5256
+ "name": "expression"
5257
+ },
4527
5258
  "_statement": {
4528
5259
  "type": "CHOICE",
4529
5260
  "members": [
@@ -4730,26 +5461,53 @@
4730
5461
  "type": "SYMBOL",
4731
5462
  "name": "_type"
4732
5463
  }
5464
+ },
5465
+ {
5466
+ "type": "CHOICE",
5467
+ "members": [
5468
+ {
5469
+ "type": "SEQ",
5470
+ "members": [
5471
+ {
5472
+ "type": "STRING",
5473
+ "value": "="
5474
+ },
5475
+ {
5476
+ "type": "FIELD",
5477
+ "name": "value",
5478
+ "content": {
5479
+ "type": "SYMBOL",
5480
+ "name": "expression"
5481
+ }
5482
+ }
5483
+ ]
5484
+ },
5485
+ {
5486
+ "type": "BLANK"
5487
+ }
5488
+ ]
4733
5489
  }
4734
5490
  ]
4735
5491
  },
4736
5492
  {
4737
- "type": "BLANK"
5493
+ "type": "SEQ",
5494
+ "members": [
5495
+ {
5496
+ "type": "STRING",
5497
+ "value": "="
5498
+ },
5499
+ {
5500
+ "type": "FIELD",
5501
+ "name": "value",
5502
+ "content": {
5503
+ "type": "SYMBOL",
5504
+ "name": "expression"
5505
+ }
5506
+ }
5507
+ ]
4738
5508
  }
4739
5509
  ]
4740
5510
  },
4741
- {
4742
- "type": "STRING",
4743
- "value": "="
4744
- },
4745
- {
4746
- "type": "FIELD",
4747
- "name": "value",
4748
- "content": {
4749
- "type": "SYMBOL",
4750
- "name": "expression"
4751
- }
4752
- },
4753
5511
  {
4754
5512
  "type": "STRING",
4755
5513
  "value": ";"
@@ -4973,17 +5731,21 @@
4973
5731
  "name": "select_expression"
4974
5732
  },
4975
5733
  {
4976
- "type": "SEQ",
4977
- "members": [
4978
- {
4979
- "type": "STRING",
4980
- "value": "fork"
4981
- },
4982
- {
4983
- "type": "SYMBOL",
4984
- "name": "block"
4985
- }
4986
- ]
5734
+ "type": "PREC",
5735
+ "value": 19,
5736
+ "content": {
5737
+ "type": "SEQ",
5738
+ "members": [
5739
+ {
5740
+ "type": "STRING",
5741
+ "value": "fork"
5742
+ },
5743
+ {
5744
+ "type": "SYMBOL",
5745
+ "name": "block"
5746
+ }
5747
+ ]
5748
+ }
4987
5749
  }
4988
5750
  ]
4989
5751
  },
@@ -5086,6 +5848,40 @@
5086
5848
  ]
5087
5849
  }
5088
5850
  },
5851
+ "return_error_expression": {
5852
+ "type": "PREC_DYNAMIC",
5853
+ "value": 1,
5854
+ "content": {
5855
+ "type": "PREC_RIGHT",
5856
+ "value": 0,
5857
+ "content": {
5858
+ "type": "SEQ",
5859
+ "members": [
5860
+ {
5861
+ "type": "STRING",
5862
+ "value": "return"
5863
+ },
5864
+ {
5865
+ "type": "STRING",
5866
+ "value": "error"
5867
+ },
5868
+ {
5869
+ "type": "CHOICE",
5870
+ "members": [
5871
+ {
5872
+ "type": "SYMBOL",
5873
+ "name": "expression"
5874
+ },
5875
+ {
5876
+ "type": "SYMBOL",
5877
+ "name": "block"
5878
+ }
5879
+ ]
5880
+ }
5881
+ ]
5882
+ }
5883
+ }
5884
+ },
5089
5885
  "defer_statement": {
5090
5886
  "type": "SEQ",
5091
5887
  "members": [
@@ -5093,6 +5889,18 @@
5093
5889
  "type": "STRING",
5094
5890
  "value": "defer"
5095
5891
  },
5892
+ {
5893
+ "type": "CHOICE",
5894
+ "members": [
5895
+ {
5896
+ "type": "STRING",
5897
+ "value": "err"
5898
+ },
5899
+ {
5900
+ "type": "BLANK"
5901
+ }
5902
+ ]
5903
+ },
5096
5904
  {
5097
5905
  "type": "CHOICE",
5098
5906
  "members": [
@@ -5209,31 +6017,19 @@
5209
6017
  }
5210
6018
  ]
5211
6019
  },
5212
- "expression_statement": {
5213
- "type": "PREC_RIGHT",
5214
- "value": 0,
5215
- "content": {
5216
- "type": "SEQ",
5217
- "members": [
5218
- {
5219
- "type": "SYMBOL",
5220
- "name": "expression"
5221
- },
5222
- {
5223
- "type": "CHOICE",
5224
- "members": [
5225
- {
5226
- "type": "STRING",
5227
- "value": ";"
5228
- },
5229
- {
5230
- "type": "BLANK"
5231
- }
5232
- ]
5233
- }
5234
- ]
5235
- }
5236
- },
6020
+ "expression_statement": {
6021
+ "type": "SEQ",
6022
+ "members": [
6023
+ {
6024
+ "type": "SYMBOL",
6025
+ "name": "expression"
6026
+ },
6027
+ {
6028
+ "type": "STRING",
6029
+ "value": ";"
6030
+ }
6031
+ ]
6032
+ },
5237
6033
  "empty_statement": {
5238
6034
  "type": "STRING",
5239
6035
  "value": ";"
@@ -5272,24 +6068,24 @@
5272
6068
  "type": "SYMBOL",
5273
6069
  "name": "select_expression"
5274
6070
  },
5275
- {
5276
- "type": "SYMBOL",
5277
- "name": "race_expression"
5278
- },
5279
6071
  {
5280
6072
  "type": "ALIAS",
5281
6073
  "content": {
5282
- "type": "SEQ",
5283
- "members": [
5284
- {
5285
- "type": "STRING",
5286
- "value": "fork"
5287
- },
5288
- {
5289
- "type": "SYMBOL",
5290
- "name": "block"
5291
- }
5292
- ]
6074
+ "type": "PREC",
6075
+ "value": 19,
6076
+ "content": {
6077
+ "type": "SEQ",
6078
+ "members": [
6079
+ {
6080
+ "type": "STRING",
6081
+ "value": "fork"
6082
+ },
6083
+ {
6084
+ "type": "SYMBOL",
6085
+ "name": "block"
6086
+ }
6087
+ ]
6088
+ }
5293
6089
  },
5294
6090
  "named": true,
5295
6091
  "value": "fork_expression"
@@ -5310,6 +6106,59 @@
5310
6106
  "value": "@[a-zA-Z_][a-zA-Z0-9_]*"
5311
6107
  },
5312
6108
  "expression": {
6109
+ "type": "CHOICE",
6110
+ "members": [
6111
+ {
6112
+ "type": "SYMBOL",
6113
+ "name": "_callable_expression"
6114
+ },
6115
+ {
6116
+ "type": "SYMBOL",
6117
+ "name": "spawn_expression"
6118
+ },
6119
+ {
6120
+ "type": "SYMBOL",
6121
+ "name": "unary_expression"
6122
+ },
6123
+ {
6124
+ "type": "SYMBOL",
6125
+ "name": "binary_expression"
6126
+ },
6127
+ {
6128
+ "type": "SYMBOL",
6129
+ "name": "await_expression"
6130
+ },
6131
+ {
6132
+ "type": "SYMBOL",
6133
+ "name": "clone_expression"
6134
+ },
6135
+ {
6136
+ "type": "SYMBOL",
6137
+ "name": "lambda"
6138
+ },
6139
+ {
6140
+ "type": "SYMBOL",
6141
+ "name": "fork_expression"
6142
+ },
6143
+ {
6144
+ "type": "SYMBOL",
6145
+ "name": "handle_expression"
6146
+ },
6147
+ {
6148
+ "type": "SYMBOL",
6149
+ "name": "yield_expression"
6150
+ },
6151
+ {
6152
+ "type": "SYMBOL",
6153
+ "name": "return_expression"
6154
+ },
6155
+ {
6156
+ "type": "SYMBOL",
6157
+ "name": "return_error_expression"
6158
+ }
6159
+ ]
6160
+ },
6161
+ "_callable_expression": {
5313
6162
  "type": "CHOICE",
5314
6163
  "members": [
5315
6164
  {
@@ -5339,15 +6188,11 @@
5339
6188
  },
5340
6189
  {
5341
6190
  "type": "SYMBOL",
5342
- "name": "unary_expression"
5343
- },
5344
- {
5345
- "type": "SYMBOL",
5346
- "name": "binary_expression"
6191
+ "name": "call_expression"
5347
6192
  },
5348
6193
  {
5349
6194
  "type": "SYMBOL",
5350
- "name": "call_expression"
6195
+ "name": "macro_invocation"
5351
6196
  },
5352
6197
  {
5353
6198
  "type": "SYMBOL",
@@ -5369,14 +6214,6 @@
5369
6214
  "type": "SYMBOL",
5370
6215
  "name": "cast_expression"
5371
6216
  },
5372
- {
5373
- "type": "SYMBOL",
5374
- "name": "await_expression"
5375
- },
5376
- {
5377
- "type": "SYMBOL",
5378
- "name": "clone_expression"
5379
- },
5380
6217
  {
5381
6218
  "type": "SYMBOL",
5382
6219
  "name": "struct_init"
@@ -5429,18 +6266,10 @@
5429
6266
  "type": "SYMBOL",
5430
6267
  "name": "match_expression"
5431
6268
  },
5432
- {
5433
- "type": "SYMBOL",
5434
- "name": "lambda"
5435
- },
5436
6269
  {
5437
6270
  "type": "SYMBOL",
5438
6271
  "name": "actor_expression"
5439
6272
  },
5440
- {
5441
- "type": "SYMBOL",
5442
- "name": "spawn_expression"
5443
- },
5444
6273
  {
5445
6274
  "type": "SYMBOL",
5446
6275
  "name": "select_expression"
@@ -5449,25 +6278,18 @@
5449
6278
  "type": "SYMBOL",
5450
6279
  "name": "race_expression"
5451
6280
  },
5452
- {
5453
- "type": "SYMBOL",
5454
- "name": "fork_expression"
5455
- },
5456
- {
5457
- "type": "SYMBOL",
5458
- "name": "handle_expression"
5459
- },
5460
6281
  {
5461
6282
  "type": "SYMBOL",
5462
6283
  "name": "scope_expression"
5463
6284
  },
5464
6285
  {
5465
- "type": "SYMBOL",
5466
- "name": "yield_expression"
5467
- },
5468
- {
5469
- "type": "SYMBOL",
5470
- "name": "return_expression"
6286
+ "type": "ALIAS",
6287
+ "content": {
6288
+ "type": "STRING",
6289
+ "value": "error"
6290
+ },
6291
+ "named": true,
6292
+ "value": "identifier"
5471
6293
  },
5472
6294
  {
5473
6295
  "type": "SYMBOL",
@@ -5908,7 +6730,7 @@
5908
6730
  },
5909
6731
  "call_expression": {
5910
6732
  "type": "PREC_LEFT",
5911
- "value": 20,
6733
+ "value": 21,
5912
6734
  "content": {
5913
6735
  "type": "SEQ",
5914
6736
  "members": [
@@ -5916,8 +6738,13 @@
5916
6738
  "type": "FIELD",
5917
6739
  "name": "function",
5918
6740
  "content": {
5919
- "type": "SYMBOL",
5920
- "name": "expression"
6741
+ "type": "ALIAS",
6742
+ "content": {
6743
+ "type": "SYMBOL",
6744
+ "name": "_callable_expression"
6745
+ },
6746
+ "named": true,
6747
+ "value": "expression"
5921
6748
  }
5922
6749
  },
5923
6750
  {
@@ -5976,12 +6803,64 @@
5976
6803
  ]
5977
6804
  }
5978
6805
  },
6806
+ "macro_invocation": {
6807
+ "type": "PREC",
6808
+ "value": 20,
6809
+ "content": {
6810
+ "type": "SEQ",
6811
+ "members": [
6812
+ {
6813
+ "type": "FIELD",
6814
+ "name": "name",
6815
+ "content": {
6816
+ "type": "CHOICE",
6817
+ "members": [
6818
+ {
6819
+ "type": "SYMBOL",
6820
+ "name": "identifier"
6821
+ },
6822
+ {
6823
+ "type": "ALIAS",
6824
+ "content": {
6825
+ "type": "STRING",
6826
+ "value": "capture"
6827
+ },
6828
+ "named": true,
6829
+ "value": "identifier"
6830
+ },
6831
+ {
6832
+ "type": "SYMBOL",
6833
+ "name": "path_expression"
6834
+ }
6835
+ ]
6836
+ }
6837
+ },
6838
+ {
6839
+ "type": "STRING",
6840
+ "value": "!"
6841
+ },
6842
+ {
6843
+ "type": "FIELD",
6844
+ "name": "arguments",
6845
+ "content": {
6846
+ "type": "ALIAS",
6847
+ "content": {
6848
+ "type": "SYMBOL",
6849
+ "name": "macro_pattern"
6850
+ },
6851
+ "named": true,
6852
+ "value": "token_tree"
6853
+ }
6854
+ }
6855
+ ]
6856
+ }
6857
+ },
5979
6858
  "method_call_expression": {
5980
6859
  "type": "PREC_DYNAMIC",
5981
6860
  "value": 2,
5982
6861
  "content": {
5983
6862
  "type": "PREC_LEFT",
5984
- "value": 21,
6863
+ "value": 22,
5985
6864
  "content": {
5986
6865
  "type": "SEQ",
5987
6866
  "members": [
@@ -6109,7 +6988,7 @@
6109
6988
  },
6110
6989
  "qualified_expression": {
6111
6990
  "type": "PREC_LEFT",
6112
- "value": 19,
6991
+ "value": 20,
6113
6992
  "content": {
6114
6993
  "type": "SEQ",
6115
6994
  "members": [
@@ -6141,7 +7020,7 @@
6141
7020
  "value": 1,
6142
7021
  "content": {
6143
7022
  "type": "PREC",
6144
- "value": 19,
7023
+ "value": 20,
6145
7024
  "content": {
6146
7025
  "type": "SEQ",
6147
7026
  "members": [
@@ -6219,7 +7098,7 @@
6219
7098
  "value": -1,
6220
7099
  "content": {
6221
7100
  "type": "PREC",
6222
- "value": 19,
7101
+ "value": 20,
6223
7102
  "content": {
6224
7103
  "type": "SEQ",
6225
7104
  "members": [
@@ -6282,7 +7161,7 @@
6282
7161
  },
6283
7162
  "bare_generic_call_expression": {
6284
7163
  "type": "PREC",
6285
- "value": 19,
7164
+ "value": 20,
6286
7165
  "content": {
6287
7166
  "type": "SEQ",
6288
7167
  "members": [
@@ -6417,6 +7296,10 @@
6417
7296
  {
6418
7297
  "type": "SYMBOL",
6419
7298
  "name": "block"
7299
+ },
7300
+ {
7301
+ "type": "SYMBOL",
7302
+ "name": "range_argument"
6420
7303
  }
6421
7304
  ]
6422
7305
  }
@@ -6430,12 +7313,80 @@
6430
7313
  {
6431
7314
  "type": "SYMBOL",
6432
7315
  "name": "block"
7316
+ },
7317
+ {
7318
+ "type": "SYMBOL",
7319
+ "name": "range_argument"
7320
+ }
7321
+ ]
7322
+ },
7323
+ "range_argument": {
7324
+ "type": "CHOICE",
7325
+ "members": [
7326
+ {
7327
+ "type": "SEQ",
7328
+ "members": [
7329
+ {
7330
+ "type": "STRING",
7331
+ "value": ".."
7332
+ },
7333
+ {
7334
+ "type": "CHOICE",
7335
+ "members": [
7336
+ {
7337
+ "type": "FIELD",
7338
+ "name": "end",
7339
+ "content": {
7340
+ "type": "SYMBOL",
7341
+ "name": "expression"
7342
+ }
7343
+ },
7344
+ {
7345
+ "type": "BLANK"
7346
+ }
7347
+ ]
7348
+ }
7349
+ ]
7350
+ },
7351
+ {
7352
+ "type": "SEQ",
7353
+ "members": [
7354
+ {
7355
+ "type": "STRING",
7356
+ "value": "..="
7357
+ },
7358
+ {
7359
+ "type": "FIELD",
7360
+ "name": "end",
7361
+ "content": {
7362
+ "type": "SYMBOL",
7363
+ "name": "expression"
7364
+ }
7365
+ }
7366
+ ]
7367
+ },
7368
+ {
7369
+ "type": "SEQ",
7370
+ "members": [
7371
+ {
7372
+ "type": "FIELD",
7373
+ "name": "start",
7374
+ "content": {
7375
+ "type": "SYMBOL",
7376
+ "name": "expression"
7377
+ }
7378
+ },
7379
+ {
7380
+ "type": "STRING",
7381
+ "value": ".."
7382
+ }
7383
+ ]
6433
7384
  }
6434
7385
  ]
6435
7386
  },
6436
7387
  "field_expression": {
6437
7388
  "type": "PREC",
6438
- "value": 19,
7389
+ "value": 20,
6439
7390
  "content": {
6440
7391
  "type": "SEQ",
6441
7392
  "members": [
@@ -6448,8 +7399,17 @@
6448
7399
  }
6449
7400
  },
6450
7401
  {
6451
- "type": "STRING",
6452
- "value": "."
7402
+ "type": "CHOICE",
7403
+ "members": [
7404
+ {
7405
+ "type": "STRING",
7406
+ "value": "."
7407
+ },
7408
+ {
7409
+ "type": "STRING",
7410
+ "value": "?."
7411
+ }
7412
+ ]
6453
7413
  },
6454
7414
  {
6455
7415
  "type": "FIELD",
@@ -6473,7 +7433,7 @@
6473
7433
  },
6474
7434
  "index_expression": {
6475
7435
  "type": "PREC",
6476
- "value": 19,
7436
+ "value": 20,
6477
7437
  "content": {
6478
7438
  "type": "SEQ",
6479
7439
  "members": [
@@ -6561,7 +7521,7 @@
6561
7521
  },
6562
7522
  "try_expression": {
6563
7523
  "type": "PREC",
6564
- "value": 19,
7524
+ "value": 18,
6565
7525
  "content": {
6566
7526
  "type": "SEQ",
6567
7527
  "members": [
@@ -6578,7 +7538,7 @@
6578
7538
  },
6579
7539
  "cast_expression": {
6580
7540
  "type": "PREC",
6581
- "value": 19,
7541
+ "value": 20,
6582
7542
  "content": {
6583
7543
  "type": "SEQ",
6584
7544
  "members": [
@@ -6607,7 +7567,7 @@
6607
7567
  },
6608
7568
  "await_expression": {
6609
7569
  "type": "PREC",
6610
- "value": 17,
7570
+ "value": 19,
6611
7571
  "content": {
6612
7572
  "type": "SEQ",
6613
7573
  "members": [
@@ -6854,7 +7814,7 @@
6854
7814
  },
6855
7815
  "contextual_variant_expression": {
6856
7816
  "type": "PREC",
6857
- "value": 19,
7817
+ "value": 20,
6858
7818
  "content": {
6859
7819
  "type": "SEQ",
6860
7820
  "members": [
@@ -6953,57 +7913,101 @@
6953
7913
  }
6954
7914
  },
6955
7915
  "field_initializer": {
6956
- "type": "SEQ",
7916
+ "type": "CHOICE",
6957
7917
  "members": [
6958
7918
  {
6959
- "type": "CHOICE",
7919
+ "type": "SYMBOL",
7920
+ "name": "_written_field_initializer"
7921
+ },
7922
+ {
7923
+ "type": "SYMBOL",
7924
+ "name": "_shorthand_field_initializer"
7925
+ }
7926
+ ]
7927
+ },
7928
+ "_written_field_initializer": {
7929
+ "type": "CHOICE",
7930
+ "members": [
7931
+ {
7932
+ "type": "SEQ",
6960
7933
  "members": [
6961
7934
  {
6962
- "type": "SEQ",
6963
- "members": [
6964
- {
6965
- "type": "FIELD",
6966
- "name": "name",
6967
- "content": {
7935
+ "type": "FIELD",
7936
+ "name": "name",
7937
+ "content": {
7938
+ "type": "CHOICE",
7939
+ "members": [
7940
+ {
6968
7941
  "type": "SYMBOL",
6969
7942
  "name": "identifier"
7943
+ },
7944
+ {
7945
+ "type": "ALIAS",
7946
+ "content": {
7947
+ "type": "STRING",
7948
+ "value": "error"
7949
+ },
7950
+ "named": true,
7951
+ "value": "identifier"
6970
7952
  }
6971
- },
6972
- {
6973
- "type": "STRING",
6974
- "value": ":"
6975
- },
6976
- {
6977
- "type": "FIELD",
6978
- "name": "value",
6979
- "content": {
6980
- "type": "SYMBOL",
6981
- "name": "expression"
6982
- }
6983
- }
6984
- ]
7953
+ ]
7954
+ }
6985
7955
  },
6986
7956
  {
6987
- "type": "SEQ",
6988
- "members": [
6989
- {
6990
- "type": "STRING",
6991
- "value": ".."
6992
- },
6993
- {
6994
- "type": "FIELD",
6995
- "name": "spread",
6996
- "content": {
6997
- "type": "SYMBOL",
6998
- "name": "expression"
6999
- }
7000
- }
7001
- ]
7957
+ "type": "STRING",
7958
+ "value": ":"
7959
+ },
7960
+ {
7961
+ "type": "FIELD",
7962
+ "name": "value",
7963
+ "content": {
7964
+ "type": "SYMBOL",
7965
+ "name": "expression"
7966
+ }
7967
+ }
7968
+ ]
7969
+ },
7970
+ {
7971
+ "type": "SEQ",
7972
+ "members": [
7973
+ {
7974
+ "type": "STRING",
7975
+ "value": ".."
7976
+ },
7977
+ {
7978
+ "type": "FIELD",
7979
+ "name": "spread",
7980
+ "content": {
7981
+ "type": "SYMBOL",
7982
+ "name": "expression"
7983
+ }
7002
7984
  }
7003
7985
  ]
7004
7986
  }
7005
7987
  ]
7006
7988
  },
7989
+ "_shorthand_field_initializer": {
7990
+ "type": "FIELD",
7991
+ "name": "name",
7992
+ "content": {
7993
+ "type": "CHOICE",
7994
+ "members": [
7995
+ {
7996
+ "type": "SYMBOL",
7997
+ "name": "identifier"
7998
+ },
7999
+ {
8000
+ "type": "ALIAS",
8001
+ "content": {
8002
+ "type": "STRING",
8003
+ "value": "error"
8004
+ },
8005
+ "named": true,
8006
+ "value": "identifier"
8007
+ }
8008
+ ]
8009
+ }
8010
+ },
7007
8011
  "array_expression": {
7008
8012
  "type": "SEQ",
7009
8013
  "members": [
@@ -7659,6 +8663,18 @@
7659
8663
  "type": "STRING",
7660
8664
  "value": "|"
7661
8665
  },
8666
+ {
8667
+ "type": "CHOICE",
8668
+ "members": [
8669
+ {
8670
+ "type": "SYMBOL",
8671
+ "name": "type_parameters"
8672
+ },
8673
+ {
8674
+ "type": "BLANK"
8675
+ }
8676
+ ]
8677
+ },
7662
8678
  {
7663
8679
  "type": "CHOICE",
7664
8680
  "members": [
@@ -7965,67 +8981,63 @@
7965
8981
  "type": "CHOICE",
7966
8982
  "members": [
7967
8983
  {
7968
- "type": "SEQ",
7969
- "members": [
7970
- {
7971
- "type": "STRING",
7972
- "value": "("
7973
- },
7974
- {
7975
- "type": "CHOICE",
7976
- "members": [
7977
- {
7978
- "type": "SEQ",
7979
- "members": [
7980
- {
7981
- "type": "SYMBOL",
7982
- "name": "call_argument"
7983
- },
7984
- {
7985
- "type": "REPEAT",
7986
- "content": {
7987
- "type": "SEQ",
7988
- "members": [
7989
- {
7990
- "type": "STRING",
7991
- "value": ","
7992
- },
7993
- {
7994
- "type": "SYMBOL",
7995
- "name": "call_argument"
7996
- }
7997
- ]
7998
- }
7999
- }
8000
- ]
8001
- },
8002
- {
8003
- "type": "BLANK"
8004
- }
8005
- ]
8006
- },
8007
- {
8008
- "type": "CHOICE",
8009
- "members": [
8010
- {
8011
- "type": "STRING",
8012
- "value": ","
8013
- },
8014
- {
8015
- "type": "BLANK"
8016
- }
8017
- ]
8018
- },
8019
- {
8020
- "type": "STRING",
8021
- "value": ")"
8022
- }
8023
- ]
8984
+ "type": "SYMBOL",
8985
+ "name": "spawn_keys"
8986
+ },
8987
+ {
8988
+ "type": "BLANK"
8989
+ }
8990
+ ]
8991
+ }
8992
+ ]
8993
+ },
8994
+ "spawn_keys": {
8995
+ "type": "SEQ",
8996
+ "members": [
8997
+ {
8998
+ "type": "STRING",
8999
+ "value": "{"
9000
+ },
9001
+ {
9002
+ "type": "SEQ",
9003
+ "members": [
9004
+ {
9005
+ "type": "SYMBOL",
9006
+ "name": "field_initializer"
9007
+ },
9008
+ {
9009
+ "type": "REPEAT",
9010
+ "content": {
9011
+ "type": "SEQ",
9012
+ "members": [
9013
+ {
9014
+ "type": "STRING",
9015
+ "value": ","
9016
+ },
9017
+ {
9018
+ "type": "SYMBOL",
9019
+ "name": "field_initializer"
9020
+ }
9021
+ ]
9022
+ }
9023
+ }
9024
+ ]
9025
+ },
9026
+ {
9027
+ "type": "CHOICE",
9028
+ "members": [
9029
+ {
9030
+ "type": "STRING",
9031
+ "value": ","
8024
9032
  },
8025
9033
  {
8026
9034
  "type": "BLANK"
8027
9035
  }
8028
9036
  ]
9037
+ },
9038
+ {
9039
+ "type": "STRING",
9040
+ "value": "}"
8029
9041
  }
8030
9042
  ]
8031
9043
  },
@@ -8395,7 +9407,7 @@
8395
9407
  },
8396
9408
  {
8397
9409
  "type": "STRING",
8398
- "value": "{"
9410
+ "value": "["
8399
9411
  },
8400
9412
  {
8401
9413
  "type": "CHOICE",
@@ -8449,13 +9461,13 @@
8449
9461
  },
8450
9462
  {
8451
9463
  "type": "STRING",
8452
- "value": "}"
9464
+ "value": "]"
8453
9465
  }
8454
9466
  ]
8455
9467
  },
8456
9468
  "fork_expression": {
8457
9469
  "type": "PREC_RIGHT",
8458
- "value": 0,
9470
+ "value": 19,
8459
9471
  "content": {
8460
9472
  "type": "SEQ",
8461
9473
  "members": [
@@ -9500,7 +10512,7 @@
9500
10512
  "conflicts": [
9501
10513
  [
9502
10514
  "_block_arm_value",
9503
- "expression"
10515
+ "_callable_expression"
9504
10516
  ],
9505
10517
  [
9506
10518
  "_block_arm_value",
@@ -9508,22 +10520,22 @@
9508
10520
  ],
9509
10521
  [
9510
10522
  "if_statement",
9511
- "expression"
10523
+ "_callable_expression"
9512
10524
  ],
9513
10525
  [
9514
10526
  "match_statement",
9515
- "expression"
10527
+ "_callable_expression"
9516
10528
  ],
9517
10529
  [
9518
10530
  "block_like_statement",
9519
- "expression"
10531
+ "_callable_expression"
9520
10532
  ],
9521
10533
  [
9522
10534
  "block_like_statement",
9523
10535
  "fork_expression"
9524
10536
  ],
9525
10537
  [
9526
- "expression",
10538
+ "_callable_expression",
9527
10539
  "struct_init"
9528
10540
  ],
9529
10541
  [
@@ -9531,12 +10543,12 @@
9531
10543
  "map_literal"
9532
10544
  ],
9533
10545
  [
9534
- "expression",
10546
+ "_callable_expression",
9535
10547
  "_member_object",
9536
10548
  "path_expression"
9537
10549
  ],
9538
10550
  [
9539
- "expression",
10551
+ "_callable_expression",
9540
10552
  "_member_object"
9541
10553
  ],
9542
10554
  [
@@ -9548,7 +10560,7 @@
9548
10560
  "bare_generic_call_expression"
9549
10561
  ],
9550
10562
  [
9551
- "expression",
10563
+ "_callable_expression",
9552
10564
  "private_capture_list"
9553
10565
  ],
9554
10566
  [
@@ -9557,9 +10569,19 @@
9557
10569
  [
9558
10570
  "trait_bound"
9559
10571
  ],
10572
+ [
10573
+ "function_type"
10574
+ ],
10575
+ [
10576
+ "actor_type"
10577
+ ],
9560
10578
  [
9561
10579
  "where_clause"
9562
10580
  ],
10581
+ [
10582
+ "return_error_expression",
10583
+ "_callable_expression"
10584
+ ],
9563
10585
  [
9564
10586
  "module_path"
9565
10587
  ],