@willbooster/tree-sitter-haskell 9.0.0 → 11.0.0

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.
Files changed (19) hide show
  1. package/README.md +11 -8
  2. package/grammar/conflicts.js +22 -19
  3. package/grammar/context.js +8 -9
  4. package/grammar/exp.js +29 -27
  5. package/grammar/externals.js +0 -7
  6. package/grammar/inline.js +7 -0
  7. package/grammar/pat.js +20 -13
  8. package/grammar/precedences.js +0 -1
  9. package/grammar/type.js +13 -10
  10. package/grammar.js +5 -14
  11. package/hsc/src/node-types.json +445 -166
  12. package/package.json +8 -8
  13. package/queries/highlights.scm +36 -65
  14. package/queries/locals.scm +3 -3
  15. package/queries/tags.scm +35 -19
  16. package/src/node-types.json +445 -166
  17. package/tree-sitter-haskell.wasm +0 -0
  18. package/tree-sitter-hsc.wasm +0 -0
  19. package/tree-sitter.json +1 -1
package/hsc/src/node-types.json CHANGED
@@ -10,7 +10,7 @@
10
10
  ]
11
11
  },
12
12
  {
13
- "type": "binding_pattern",
13
+ "type": "binding_pattern_operand",
14
14
  "named": true,
15
15
  "subtypes": [
16
16
  {
@@ -29,10 +29,6 @@
29
29
  "type": "hsc",
30
30
  "named": true
31
31
  },
32
- {
33
- "type": "infix",
34
- "named": true
35
- },
36
32
  {
37
33
  "type": "irrefutable",
38
34
  "named": true
@@ -150,7 +146,7 @@
150
146
  ]
151
147
  },
152
148
  {
153
- "type": "constraint",
149
+ "type": "constraint_operand",
154
150
  "named": true,
155
151
  "subtypes": [
156
152
  {
@@ -161,10 +157,6 @@
161
157
  "type": "hsc",
162
158
  "named": true
163
159
  },
164
- {
165
- "type": "infix",
166
- "named": true
167
- },
168
160
  {
169
161
  "type": "literal",
170
162
  "named": true
@@ -236,7 +228,7 @@
236
228
  "named": true,
237
229
  "subtypes": [
238
230
  {
239
- "type": "constraint",
231
+ "type": "constraint_operand",
240
232
  "named": true
241
233
  },
242
234
  {
@@ -251,6 +243,10 @@
251
243
  "type": "implicit_parameter",
252
244
  "named": true
253
245
  },
246
+ {
247
+ "type": "infix_chain",
248
+ "named": true
249
+ },
254
250
  {
255
251
  "type": "signature",
256
252
  "named": true
@@ -366,7 +362,7 @@
366
362
  ]
367
363
  },
368
364
  {
369
- "type": "expression",
365
+ "type": "expression_operand",
370
366
  "named": true,
371
367
  "subtypes": [
372
368
  {
@@ -401,10 +397,6 @@
401
397
  "type": "implicit_variable",
402
398
  "named": true
403
399
  },
404
- {
405
- "type": "infix",
406
- "named": true
407
- },
408
400
  {
409
401
  "type": "label",
410
402
  "named": true
@@ -445,10 +437,6 @@
445
437
  "type": "multi_way_if",
446
438
  "named": true
447
439
  },
448
- {
449
- "type": "negation",
450
- "named": true
451
- },
452
440
  {
453
441
  "type": "parens",
454
442
  "named": true
@@ -580,7 +568,7 @@
580
568
  ]
581
569
  },
582
570
  {
583
- "type": "pattern",
571
+ "type": "pattern_operand",
584
572
  "named": true,
585
573
  "subtypes": [
586
574
  {
@@ -599,10 +587,6 @@
599
587
  "type": "hsc",
600
588
  "named": true
601
589
  },
602
- {
603
- "type": "infix",
604
- "named": true
605
- },
606
590
  {
607
591
  "type": "irrefutable",
608
592
  "named": true
@@ -739,12 +723,16 @@
739
723
  "type": "implicit_parameter",
740
724
  "named": true
741
725
  },
726
+ {
727
+ "type": "infix_chain",
728
+ "named": true
729
+ },
742
730
  {
743
731
  "type": "linear_function",
744
732
  "named": true
745
733
  },
746
734
  {
747
- "type": "type",
735
+ "type": "type_operand",
748
736
  "named": true
749
737
  }
750
738
  ]
@@ -772,7 +760,7 @@
772
760
  ]
773
761
  },
774
762
  {
775
- "type": "type",
763
+ "type": "type_operand",
776
764
  "named": true,
777
765
  "subtypes": [
778
766
  {
@@ -783,10 +771,6 @@
783
771
  "type": "hsc",
784
772
  "named": true
785
773
  },
786
- {
787
- "type": "infix",
788
- "named": true
789
- },
790
774
  {
791
775
  "type": "list",
792
776
  "named": true
@@ -934,7 +918,11 @@
934
918
  "required": false,
935
919
  "types": [
936
920
  {
937
- "type": "pattern",
921
+ "type": "infix_chain",
922
+ "named": true
923
+ },
924
+ {
925
+ "type": "pattern_operand",
938
926
  "named": true
939
927
  },
940
928
  {
@@ -1024,7 +1012,7 @@
1024
1012
  "required": true,
1025
1013
  "types": [
1026
1014
  {
1027
- "type": "binding_pattern",
1015
+ "type": "binding_pattern_operand",
1028
1016
  "named": true
1029
1017
  },
1030
1018
  {
@@ -1032,7 +1020,7 @@
1032
1020
  "named": true
1033
1021
  },
1034
1022
  {
1035
- "type": "expression",
1023
+ "type": "expression_operand",
1036
1024
  "named": true
1037
1025
  },
1038
1026
  {
@@ -1040,19 +1028,19 @@
1040
1028
  "named": true
1041
1029
  },
1042
1030
  {
1043
- "type": "pattern",
1031
+ "type": "pattern_operand",
1044
1032
  "named": true
1045
1033
  },
1046
1034
  {
1047
- "type": "type",
1035
+ "type": "type_application",
1048
1036
  "named": true
1049
1037
  },
1050
1038
  {
1051
- "type": "type_application",
1039
+ "type": "type_binder",
1052
1040
  "named": true
1053
1041
  },
1054
1042
  {
1055
- "type": "type_binder",
1043
+ "type": "type_operand",
1056
1044
  "named": true
1057
1045
  }
1058
1046
  ]
@@ -1062,11 +1050,11 @@
1062
1050
  "required": false,
1063
1051
  "types": [
1064
1052
  {
1065
- "type": "constraint",
1053
+ "type": "constraint_operand",
1066
1054
  "named": true
1067
1055
  },
1068
1056
  {
1069
- "type": "type",
1057
+ "type": "type_operand",
1070
1058
  "named": true
1071
1059
  }
1072
1060
  ]
@@ -1076,15 +1064,15 @@
1076
1064
  "required": false,
1077
1065
  "types": [
1078
1066
  {
1079
- "type": "binding_pattern",
1067
+ "type": "binding_pattern_operand",
1080
1068
  "named": true
1081
1069
  },
1082
1070
  {
1083
- "type": "expression",
1071
+ "type": "expression_operand",
1084
1072
  "named": true
1085
1073
  },
1086
1074
  {
1087
- "type": "pattern",
1075
+ "type": "pattern_operand",
1088
1076
  "named": true
1089
1077
  }
1090
1078
  ]
@@ -1100,7 +1088,11 @@
1100
1088
  "required": true,
1101
1089
  "types": [
1102
1090
  {
1103
- "type": "expression",
1091
+ "type": "expression_operand",
1092
+ "named": true
1093
+ },
1094
+ {
1095
+ "type": "operator_chain",
1104
1096
  "named": true
1105
1097
  },
1106
1098
  {
@@ -1114,7 +1106,11 @@
1114
1106
  "required": false,
1115
1107
  "types": [
1116
1108
  {
1117
- "type": "expression",
1109
+ "type": "expression_operand",
1110
+ "named": true
1111
+ },
1112
+ {
1113
+ "type": "operator_chain",
1118
1114
  "named": true
1119
1115
  },
1120
1116
  {
@@ -1128,7 +1124,11 @@
1128
1124
  "required": false,
1129
1125
  "types": [
1130
1126
  {
1131
- "type": "expression",
1127
+ "type": "expression_operand",
1128
+ "named": true
1129
+ },
1130
+ {
1131
+ "type": "operator_chain",
1132
1132
  "named": true
1133
1133
  },
1134
1134
  {
@@ -1158,11 +1158,11 @@
1158
1158
  "required": true,
1159
1159
  "types": [
1160
1160
  {
1161
- "type": "binding_pattern",
1161
+ "type": "binding_pattern_operand",
1162
1162
  "named": true
1163
1163
  },
1164
1164
  {
1165
- "type": "pattern",
1165
+ "type": "pattern_operand",
1166
1166
  "named": true
1167
1167
  }
1168
1168
  ]
@@ -1232,7 +1232,11 @@
1232
1232
  "required": false,
1233
1233
  "types": [
1234
1234
  {
1235
- "type": "expression",
1235
+ "type": "expression_operand",
1236
+ "named": true
1237
+ },
1238
+ {
1239
+ "type": "operator_chain",
1236
1240
  "named": true
1237
1241
  },
1238
1242
  {
@@ -1288,11 +1292,15 @@
1288
1292
  "required": false,
1289
1293
  "types": [
1290
1294
  {
1291
- "type": "binding_pattern",
1295
+ "type": "binding_pattern_operand",
1292
1296
  "named": true
1293
1297
  },
1294
1298
  {
1295
- "type": "pattern",
1299
+ "type": "infix_chain",
1300
+ "named": true
1301
+ },
1302
+ {
1303
+ "type": "pattern_operand",
1296
1304
  "named": true
1297
1305
  },
1298
1306
  {
@@ -1340,7 +1348,11 @@
1340
1348
  "required": true,
1341
1349
  "types": [
1342
1350
  {
1343
- "type": "expression",
1351
+ "type": "expression_operand",
1352
+ "named": true
1353
+ },
1354
+ {
1355
+ "type": "operator_chain",
1344
1356
  "named": true
1345
1357
  },
1346
1358
  {
@@ -1370,7 +1382,11 @@
1370
1382
  "required": true,
1371
1383
  "types": [
1372
1384
  {
1373
- "type": "expression",
1385
+ "type": "expression_operand",
1386
+ "named": true
1387
+ },
1388
+ {
1389
+ "type": "operator_chain",
1374
1390
  "named": true
1375
1391
  },
1376
1392
  {
@@ -1543,7 +1559,11 @@
1543
1559
  "required": true,
1544
1560
  "types": [
1545
1561
  {
1546
- "type": "expression",
1562
+ "type": "expression_operand",
1563
+ "named": true
1564
+ },
1565
+ {
1566
+ "type": "operator_chain",
1547
1567
  "named": true
1548
1568
  },
1549
1569
  {
@@ -1557,7 +1577,11 @@
1557
1577
  "required": true,
1558
1578
  "types": [
1559
1579
  {
1560
- "type": "expression",
1580
+ "type": "expression_operand",
1581
+ "named": true
1582
+ },
1583
+ {
1584
+ "type": "operator_chain",
1561
1585
  "named": true
1562
1586
  },
1563
1587
  {
@@ -1571,7 +1595,11 @@
1571
1595
  "required": true,
1572
1596
  "types": [
1573
1597
  {
1574
- "type": "expression",
1598
+ "type": "expression_operand",
1599
+ "named": true
1600
+ },
1601
+ {
1602
+ "type": "operator_chain",
1575
1603
  "named": true
1576
1604
  },
1577
1605
  {
@@ -1648,7 +1676,11 @@
1648
1676
  "required": false,
1649
1677
  "types": [
1650
1678
  {
1651
- "type": "pattern",
1679
+ "type": "infix_chain",
1680
+ "named": true
1681
+ },
1682
+ {
1683
+ "type": "pattern_operand",
1652
1684
  "named": true
1653
1685
  },
1654
1686
  {
@@ -1707,7 +1739,11 @@
1707
1739
  "required": true,
1708
1740
  "types": [
1709
1741
  {
1710
- "type": "constraint",
1742
+ "type": "constraint_operand",
1743
+ "named": true
1744
+ },
1745
+ {
1746
+ "type": "infix_chain",
1711
1747
  "named": true
1712
1748
  }
1713
1749
  ]
@@ -1932,6 +1968,10 @@
1932
1968
  {
1933
1969
  "type": "infix",
1934
1970
  "named": true
1971
+ },
1972
+ {
1973
+ "type": "infix_chain",
1974
+ "named": true
1935
1975
  }
1936
1976
  ]
1937
1977
  },
@@ -2055,7 +2095,11 @@
2055
2095
  "required": true,
2056
2096
  "types": [
2057
2097
  {
2058
- "type": "constraint",
2098
+ "type": "constraint_operand",
2099
+ "named": true
2100
+ },
2101
+ {
2102
+ "type": "infix_chain",
2059
2103
  "named": true
2060
2104
  }
2061
2105
  ]
@@ -2115,7 +2159,7 @@
2115
2159
  "required": false,
2116
2160
  "types": [
2117
2161
  {
2118
- "type": "infix",
2162
+ "type": "infix_chain",
2119
2163
  "named": true
2120
2164
  }
2121
2165
  ]
@@ -2302,7 +2346,7 @@
2302
2346
  "required": false,
2303
2347
  "types": [
2304
2348
  {
2305
- "type": "infix",
2349
+ "type": "infix_chain",
2306
2350
  "named": true
2307
2351
  }
2308
2352
  ]
@@ -2344,7 +2388,11 @@
2344
2388
  "required": false,
2345
2389
  "types": [
2346
2390
  {
2347
- "type": "pattern",
2391
+ "type": "infix_chain",
2392
+ "named": true
2393
+ },
2394
+ {
2395
+ "type": "pattern_operand",
2348
2396
  "named": true
2349
2397
  },
2350
2398
  {
@@ -2368,7 +2416,11 @@
2368
2416
  "required": false,
2369
2417
  "types": [
2370
2418
  {
2371
- "type": "pattern",
2419
+ "type": "infix_chain",
2420
+ "named": true
2421
+ },
2422
+ {
2423
+ "type": "pattern_operand",
2372
2424
  "named": true
2373
2425
  }
2374
2426
  ]
@@ -2410,7 +2462,11 @@
2410
2462
  "required": true,
2411
2463
  "types": [
2412
2464
  {
2413
- "type": "expression",
2465
+ "type": "expression_operand",
2466
+ "named": true
2467
+ },
2468
+ {
2469
+ "type": "operator_chain",
2414
2470
  "named": true
2415
2471
  },
2416
2472
  {
@@ -2429,7 +2485,11 @@
2429
2485
  "required": true,
2430
2486
  "types": [
2431
2487
  {
2432
- "type": "type",
2488
+ "type": "infix_chain",
2489
+ "named": true
2490
+ },
2491
+ {
2492
+ "type": "type_operand",
2433
2493
  "named": true
2434
2494
  }
2435
2495
  ]
@@ -2592,7 +2652,11 @@
2592
2652
  "required": false,
2593
2653
  "types": [
2594
2654
  {
2595
- "type": "type",
2655
+ "type": "infix_chain",
2656
+ "named": true
2657
+ },
2658
+ {
2659
+ "type": "type_operand",
2596
2660
  "named": true
2597
2661
  }
2598
2662
  ]
@@ -2666,11 +2730,15 @@
2666
2730
  "required": false,
2667
2731
  "types": [
2668
2732
  {
2669
- "type": "binding_pattern",
2733
+ "type": "binding_pattern_operand",
2670
2734
  "named": true
2671
2735
  },
2672
2736
  {
2673
- "type": "pattern",
2737
+ "type": "infix_chain",
2738
+ "named": true
2739
+ },
2740
+ {
2741
+ "type": "pattern_operand",
2674
2742
  "named": true
2675
2743
  },
2676
2744
  {
@@ -2704,7 +2772,11 @@
2704
2772
  "required": false,
2705
2773
  "types": [
2706
2774
  {
2707
- "type": "expression",
2775
+ "type": "expression_operand",
2776
+ "named": true
2777
+ },
2778
+ {
2779
+ "type": "operator_chain",
2708
2780
  "named": true
2709
2781
  },
2710
2782
  {
@@ -3258,7 +3330,11 @@
3258
3330
  "required": true,
3259
3331
  "types": [
3260
3332
  {
3261
- "type": "expression",
3333
+ "type": "expression_operand",
3334
+ "named": true
3335
+ },
3336
+ {
3337
+ "type": "operator_chain",
3262
3338
  "named": true
3263
3339
  },
3264
3340
  {
@@ -3272,7 +3348,11 @@
3272
3348
  "required": true,
3273
3349
  "types": [
3274
3350
  {
3275
- "type": "pattern",
3351
+ "type": "infix_chain",
3352
+ "named": true
3353
+ },
3354
+ {
3355
+ "type": "pattern_operand",
3276
3356
  "named": true
3277
3357
  },
3278
3358
  {
@@ -3292,7 +3372,11 @@
3292
3372
  "required": true,
3293
3373
  "types": [
3294
3374
  {
3295
- "type": "expression",
3375
+ "type": "expression_operand",
3376
+ "named": true
3377
+ },
3378
+ {
3379
+ "type": "operator_chain",
3296
3380
  "named": true
3297
3381
  },
3298
3382
  {
@@ -3306,7 +3390,11 @@
3306
3390
  "required": false,
3307
3391
  "types": [
3308
3392
  {
3309
- "type": "expression",
3393
+ "type": "expression_operand",
3394
+ "named": true
3395
+ },
3396
+ {
3397
+ "type": "operator_chain",
3310
3398
  "named": true
3311
3399
  },
3312
3400
  {
@@ -3673,11 +3761,7 @@
3673
3761
  "required": true,
3674
3762
  "types": [
3675
3763
  {
3676
- "type": "binding_pattern",
3677
- "named": true
3678
- },
3679
- {
3680
- "type": "expression",
3764
+ "type": "infix_chain",
3681
3765
  "named": true
3682
3766
  },
3683
3767
  {
@@ -3685,7 +3769,7 @@
3685
3769
  "named": true
3686
3770
  },
3687
3771
  {
3688
- "type": "pattern",
3772
+ "type": "pattern_operand",
3689
3773
  "named": true
3690
3774
  },
3691
3775
  {
@@ -3693,7 +3777,7 @@
3693
3777
  "named": true
3694
3778
  },
3695
3779
  {
3696
- "type": "type",
3780
+ "type": "type_operand",
3697
3781
  "named": true
3698
3782
  },
3699
3783
  {
@@ -3718,10 +3802,6 @@
3718
3802
  "type": "operator",
3719
3803
  "named": true
3720
3804
  },
3721
- {
3722
- "type": "promoted",
3723
- "named": true
3724
- },
3725
3805
  {
3726
3806
  "type": "qualified",
3727
3807
  "named": true
@@ -3733,11 +3813,7 @@
3733
3813
  "required": true,
3734
3814
  "types": [
3735
3815
  {
3736
- "type": "binding_pattern",
3737
- "named": true
3738
- },
3739
- {
3740
- "type": "expression",
3816
+ "type": "infix_chain",
3741
3817
  "named": true
3742
3818
  },
3743
3819
  {
@@ -3745,7 +3821,7 @@
3745
3821
  "named": true
3746
3822
  },
3747
3823
  {
3748
- "type": "pattern",
3824
+ "type": "pattern_operand",
3749
3825
  "named": true
3750
3826
  },
3751
3827
  {
@@ -3753,7 +3829,7 @@
3753
3829
  "named": true
3754
3830
  },
3755
3831
  {
3756
- "type": "type",
3832
+ "type": "type_operand",
3757
3833
  "named": true
3758
3834
  },
3759
3835
  {
@@ -3764,6 +3840,56 @@
3764
3840
  }
3765
3841
  }
3766
3842
  },
3843
+ {
3844
+ "type": "infix_chain",
3845
+ "named": true,
3846
+ "fields": {
3847
+ "operand": {
3848
+ "multiple": true,
3849
+ "required": true,
3850
+ "types": [
3851
+ {
3852
+ "type": "binding_pattern_operand",
3853
+ "named": true
3854
+ },
3855
+ {
3856
+ "type": "pattern_operand",
3857
+ "named": true
3858
+ },
3859
+ {
3860
+ "type": "type_operand",
3861
+ "named": true
3862
+ }
3863
+ ]
3864
+ },
3865
+ "operator": {
3866
+ "multiple": true,
3867
+ "required": true,
3868
+ "types": [
3869
+ {
3870
+ "type": "constructor_operator",
3871
+ "named": true
3872
+ },
3873
+ {
3874
+ "type": "infix_id",
3875
+ "named": true
3876
+ },
3877
+ {
3878
+ "type": "operator",
3879
+ "named": true
3880
+ },
3881
+ {
3882
+ "type": "promoted",
3883
+ "named": true
3884
+ },
3885
+ {
3886
+ "type": "qualified",
3887
+ "named": true
3888
+ }
3889
+ ]
3890
+ }
3891
+ }
3892
+ },
3767
3893
  {
3768
3894
  "type": "infix_id",
3769
3895
  "named": true,
@@ -3834,7 +3960,7 @@
3834
3960
  "required": false,
3835
3961
  "types": [
3836
3962
  {
3837
- "type": "infix",
3963
+ "type": "infix_chain",
3838
3964
  "named": true
3839
3965
  }
3840
3966
  ]
@@ -3929,11 +4055,11 @@
3929
4055
  "required": true,
3930
4056
  "types": [
3931
4057
  {
3932
- "type": "binding_pattern",
4058
+ "type": "binding_pattern_operand",
3933
4059
  "named": true
3934
4060
  },
3935
4061
  {
3936
- "type": "pattern",
4062
+ "type": "pattern_operand",
3937
4063
  "named": true
3938
4064
  }
3939
4065
  ]
@@ -3949,7 +4075,7 @@
3949
4075
  "required": true,
3950
4076
  "types": [
3951
4077
  {
3952
- "type": "type",
4078
+ "type": "type_operand",
3953
4079
  "named": true
3954
4080
  }
3955
4081
  ]
@@ -4027,7 +4153,11 @@
4027
4153
  "required": true,
4028
4154
  "types": [
4029
4155
  {
4030
- "type": "expression",
4156
+ "type": "expression_operand",
4157
+ "named": true
4158
+ },
4159
+ {
4160
+ "type": "operator_chain",
4031
4161
  "named": true
4032
4162
  },
4033
4163
  {
@@ -4089,7 +4219,11 @@
4089
4219
  "required": true,
4090
4220
  "types": [
4091
4221
  {
4092
- "type": "type",
4222
+ "type": "infix_chain",
4223
+ "named": true
4224
+ },
4225
+ {
4226
+ "type": "type_operand",
4093
4227
  "named": true
4094
4228
  }
4095
4229
  ]
@@ -4105,7 +4239,11 @@
4105
4239
  "required": true,
4106
4240
  "types": [
4107
4241
  {
4108
- "type": "expression",
4242
+ "type": "expression_operand",
4243
+ "named": true
4244
+ },
4245
+ {
4246
+ "type": "operator_chain",
4109
4247
  "named": true
4110
4248
  }
4111
4249
  ]
@@ -4169,7 +4307,11 @@
4169
4307
  "required": true,
4170
4308
  "types": [
4171
4309
  {
4172
- "type": "expression",
4310
+ "type": "expression_operand",
4311
+ "named": true
4312
+ },
4313
+ {
4314
+ "type": "operator_chain",
4173
4315
  "named": true
4174
4316
  },
4175
4317
  {
@@ -4255,15 +4397,19 @@
4255
4397
  "required": false,
4256
4398
  "types": [
4257
4399
  {
4258
- "type": "binding_pattern",
4400
+ "type": "binding_pattern_operand",
4401
+ "named": true
4402
+ },
4403
+ {
4404
+ "type": "expression_operand",
4259
4405
  "named": true
4260
4406
  },
4261
4407
  {
4262
- "type": "expression",
4408
+ "type": "operator_chain",
4263
4409
  "named": true
4264
4410
  },
4265
4411
  {
4266
- "type": "pattern",
4412
+ "type": "pattern_operand",
4267
4413
  "named": true
4268
4414
  },
4269
4415
  {
@@ -4291,7 +4437,11 @@
4291
4437
  "required": true,
4292
4438
  "types": [
4293
4439
  {
4294
- "type": "expression",
4440
+ "type": "expression_operand",
4441
+ "named": true
4442
+ },
4443
+ {
4444
+ "type": "operator_chain",
4295
4445
  "named": true
4296
4446
  },
4297
4447
  {
@@ -4389,7 +4539,11 @@
4389
4539
  "required": true,
4390
4540
  "types": [
4391
4541
  {
4392
- "type": "expression",
4542
+ "type": "expression_operand",
4543
+ "named": true
4544
+ },
4545
+ {
4546
+ "type": "operator_chain",
4393
4547
  "named": true
4394
4548
  },
4395
4549
  {
@@ -4419,7 +4573,11 @@
4419
4573
  "required": true,
4420
4574
  "types": [
4421
4575
  {
4422
- "type": "type",
4576
+ "type": "infix_chain",
4577
+ "named": true
4578
+ },
4579
+ {
4580
+ "type": "type_operand",
4423
4581
  "named": true
4424
4582
  }
4425
4583
  ]
@@ -4481,29 +4639,9 @@
4481
4639
  "type": "negation",
4482
4640
  "named": true,
4483
4641
  "fields": {
4484
- "expression": {
4485
- "multiple": false,
4486
- "required": false,
4487
- "types": [
4488
- {
4489
- "type": "expression",
4490
- "named": true
4491
- }
4492
- ]
4493
- },
4494
- "minus": {
4495
- "multiple": false,
4496
- "required": false,
4497
- "types": [
4498
- {
4499
- "type": "-",
4500
- "named": false
4501
- }
4502
- ]
4503
- },
4504
4642
  "number": {
4505
4643
  "multiple": false,
4506
- "required": false,
4644
+ "required": true,
4507
4645
  "types": [
4508
4646
  {
4509
4647
  "type": "float",
@@ -4582,6 +4720,10 @@
4582
4720
  {
4583
4721
  "type": "infix",
4584
4722
  "named": true
4723
+ },
4724
+ {
4725
+ "type": "infix_chain",
4726
+ "named": true
4585
4727
  }
4586
4728
  ]
4587
4729
  },
@@ -4684,6 +4826,54 @@
4684
4826
  "named": true,
4685
4827
  "fields": {}
4686
4828
  },
4829
+ {
4830
+ "type": "operator_chain",
4831
+ "named": true,
4832
+ "fields": {
4833
+ "operand": {
4834
+ "multiple": true,
4835
+ "required": true,
4836
+ "types": [
4837
+ {
4838
+ "type": "expression_operand",
4839
+ "named": true
4840
+ }
4841
+ ]
4842
+ },
4843
+ "operator": {
4844
+ "multiple": true,
4845
+ "required": false,
4846
+ "types": [
4847
+ {
4848
+ "type": "constructor_operator",
4849
+ "named": true
4850
+ },
4851
+ {
4852
+ "type": "infix_id",
4853
+ "named": true
4854
+ },
4855
+ {
4856
+ "type": "operator",
4857
+ "named": true
4858
+ },
4859
+ {
4860
+ "type": "qualified",
4861
+ "named": true
4862
+ }
4863
+ ]
4864
+ },
4865
+ "prefix_operator": {
4866
+ "multiple": true,
4867
+ "required": false,
4868
+ "types": [
4869
+ {
4870
+ "type": "prefix_negation",
4871
+ "named": true
4872
+ }
4873
+ ]
4874
+ }
4875
+ }
4876
+ },
4687
4877
  {
4688
4878
  "type": "parens",
4689
4879
  "named": true,
@@ -4703,7 +4893,11 @@
4703
4893
  "required": false,
4704
4894
  "types": [
4705
4895
  {
4706
- "type": "expression",
4896
+ "type": "expression_operand",
4897
+ "named": true
4898
+ },
4899
+ {
4900
+ "type": "operator_chain",
4707
4901
  "named": true
4708
4902
  },
4709
4903
  {
@@ -4717,11 +4911,15 @@
4717
4911
  "required": false,
4718
4912
  "types": [
4719
4913
  {
4720
- "type": "binding_pattern",
4914
+ "type": "binding_pattern_operand",
4915
+ "named": true
4916
+ },
4917
+ {
4918
+ "type": "infix_chain",
4721
4919
  "named": true
4722
4920
  },
4723
4921
  {
4724
- "type": "pattern",
4922
+ "type": "pattern_operand",
4725
4923
  "named": true
4726
4924
  },
4727
4925
  {
@@ -4826,7 +5024,11 @@
4826
5024
  "required": true,
4827
5025
  "types": [
4828
5026
  {
4829
- "type": "expression",
5027
+ "type": "expression_operand",
5028
+ "named": true
5029
+ },
5030
+ {
5031
+ "type": "operator_chain",
4830
5032
  "named": true
4831
5033
  },
4832
5034
  {
@@ -4840,7 +5042,11 @@
4840
5042
  "required": true,
4841
5043
  "types": [
4842
5044
  {
4843
- "type": "pattern",
5045
+ "type": "infix_chain",
5046
+ "named": true
5047
+ },
5048
+ {
5049
+ "type": "pattern_operand",
4844
5050
  "named": true
4845
5051
  },
4846
5052
  {
@@ -4883,7 +5089,7 @@
4883
5089
  "named": true
4884
5090
  },
4885
5091
  {
4886
- "type": "pattern",
5092
+ "type": "pattern_operand",
4887
5093
  "named": true
4888
5094
  },
4889
5095
  {
@@ -4901,6 +5107,10 @@
4901
5107
  "multiple": true,
4902
5108
  "required": false,
4903
5109
  "types": [
5110
+ {
5111
+ "type": "infix_chain",
5112
+ "named": true
5113
+ },
4904
5114
  {
4905
5115
  "type": "lazy_field",
4906
5116
  "named": true
@@ -4910,7 +5120,7 @@
4910
5120
  "named": true
4911
5121
  },
4912
5122
  {
4913
- "type": "type",
5123
+ "type": "type_operand",
4914
5124
  "named": true
4915
5125
  }
4916
5126
  ]
@@ -4973,6 +5183,11 @@
4973
5183
  "named": true,
4974
5184
  "fields": {}
4975
5185
  },
5186
+ {
5187
+ "type": "prefix_negation",
5188
+ "named": true,
5189
+ "fields": {}
5190
+ },
4976
5191
  {
4977
5192
  "type": "prefix_tuple",
4978
5193
  "named": true,
@@ -4997,7 +5212,7 @@
4997
5212
  "required": true,
4998
5213
  "types": [
4999
5214
  {
5000
- "type": "expression",
5215
+ "type": "expression_operand",
5001
5216
  "named": true
5002
5217
  }
5003
5218
  ]
@@ -5358,7 +5573,11 @@
5358
5573
  "required": true,
5359
5574
  "types": [
5360
5575
  {
5361
- "type": "expression",
5576
+ "type": "expression_operand",
5577
+ "named": true
5578
+ },
5579
+ {
5580
+ "type": "operator_chain",
5362
5581
  "named": true
5363
5582
  },
5364
5583
  {
@@ -5377,7 +5596,11 @@
5377
5596
  "required": true,
5378
5597
  "types": [
5379
5598
  {
5380
- "type": "pattern",
5599
+ "type": "infix_chain",
5600
+ "named": true
5601
+ },
5602
+ {
5603
+ "type": "pattern_operand",
5381
5604
  "named": true
5382
5605
  },
5383
5606
  {
@@ -5464,11 +5687,11 @@
5464
5687
  "required": false,
5465
5688
  "types": [
5466
5689
  {
5467
- "type": "binding_pattern",
5690
+ "type": "binding_pattern_operand",
5468
5691
  "named": true
5469
5692
  },
5470
5693
  {
5471
- "type": "pattern",
5694
+ "type": "pattern_operand",
5472
5695
  "named": true
5473
5696
  }
5474
5697
  ]
@@ -5478,7 +5701,7 @@
5478
5701
  "required": false,
5479
5702
  "types": [
5480
5703
  {
5481
- "type": "expression",
5704
+ "type": "expression_operand",
5482
5705
  "named": true
5483
5706
  }
5484
5707
  ]
@@ -5546,7 +5769,11 @@
5546
5769
  "required": true,
5547
5770
  "types": [
5548
5771
  {
5549
- "type": "expression",
5772
+ "type": "expression_operand",
5773
+ "named": true
5774
+ },
5775
+ {
5776
+ "type": "operator_chain",
5550
5777
  "named": true
5551
5778
  }
5552
5779
  ]
@@ -5632,7 +5859,11 @@
5632
5859
  "required": false,
5633
5860
  "types": [
5634
5861
  {
5635
- "type": "expression",
5862
+ "type": "expression_operand",
5863
+ "named": true
5864
+ },
5865
+ {
5866
+ "type": "operator_chain",
5636
5867
  "named": true
5637
5868
  }
5638
5869
  ]
@@ -5680,11 +5911,15 @@
5680
5911
  "required": false,
5681
5912
  "types": [
5682
5913
  {
5683
- "type": "binding_pattern",
5914
+ "type": "binding_pattern_operand",
5915
+ "named": true
5916
+ },
5917
+ {
5918
+ "type": "infix_chain",
5684
5919
  "named": true
5685
5920
  },
5686
5921
  {
5687
- "type": "pattern",
5922
+ "type": "pattern_operand",
5688
5923
  "named": true
5689
5924
  }
5690
5925
  ]
@@ -5816,11 +6051,11 @@
5816
6051
  "required": true,
5817
6052
  "types": [
5818
6053
  {
5819
- "type": "binding_pattern",
6054
+ "type": "binding_pattern_operand",
5820
6055
  "named": true
5821
6056
  },
5822
6057
  {
5823
- "type": "pattern",
6058
+ "type": "pattern_operand",
5824
6059
  "named": true
5825
6060
  }
5826
6061
  ]
@@ -5836,7 +6071,11 @@
5836
6071
  "required": true,
5837
6072
  "types": [
5838
6073
  {
5839
- "type": "type",
6074
+ "type": "infix_chain",
6075
+ "named": true
6076
+ },
6077
+ {
6078
+ "type": "type_operand",
5840
6079
  "named": true
5841
6080
  }
5842
6081
  ]
@@ -5878,7 +6117,11 @@
5878
6117
  "required": false,
5879
6118
  "types": [
5880
6119
  {
5881
- "type": "type",
6120
+ "type": "infix_chain",
6121
+ "named": true
6122
+ },
6123
+ {
6124
+ "type": "type_operand",
5882
6125
  "named": true
5883
6126
  }
5884
6127
  ]
@@ -5894,7 +6137,11 @@
5894
6137
  "required": true,
5895
6138
  "types": [
5896
6139
  {
5897
- "type": "expression",
6140
+ "type": "expression_operand",
6141
+ "named": true
6142
+ },
6143
+ {
6144
+ "type": "operator_chain",
5898
6145
  "named": true
5899
6146
  }
5900
6147
  ]
@@ -5909,7 +6156,11 @@
5909
6156
  "required": false,
5910
6157
  "types": [
5911
6158
  {
5912
- "type": "expression",
6159
+ "type": "expression_operand",
6160
+ "named": true
6161
+ },
6162
+ {
6163
+ "type": "operator_chain",
5913
6164
  "named": true
5914
6165
  },
5915
6166
  {
@@ -5923,7 +6174,11 @@
5923
6174
  "required": true,
5924
6175
  "types": [
5925
6176
  {
5926
- "type": "expression",
6177
+ "type": "expression_operand",
6178
+ "named": true
6179
+ },
6180
+ {
6181
+ "type": "operator_chain",
5927
6182
  "named": true
5928
6183
  },
5929
6184
  {
@@ -5943,15 +6198,19 @@
5943
6198
  "required": false,
5944
6199
  "types": [
5945
6200
  {
5946
- "type": "binding_pattern",
6201
+ "type": "binding_pattern_operand",
5947
6202
  "named": true
5948
6203
  },
5949
6204
  {
5950
- "type": "expression",
6205
+ "type": "expression_operand",
5951
6206
  "named": true
5952
6207
  },
5953
6208
  {
5954
- "type": "pattern",
6209
+ "type": "operator_chain",
6210
+ "named": true
6211
+ },
6212
+ {
6213
+ "type": "pattern_operand",
5955
6214
  "named": true
5956
6215
  },
5957
6216
  {
@@ -5989,7 +6248,7 @@
5989
6248
  "required": true,
5990
6249
  "types": [
5991
6250
  {
5992
- "type": "type",
6251
+ "type": "type_operand",
5993
6252
  "named": true
5994
6253
  }
5995
6254
  ]
@@ -6005,7 +6264,7 @@
6005
6264
  "required": true,
6006
6265
  "types": [
6007
6266
  {
6008
- "type": "type",
6267
+ "type": "type_operand",
6009
6268
  "named": true
6010
6269
  }
6011
6270
  ]
@@ -6167,7 +6426,7 @@
6167
6426
  "required": false,
6168
6427
  "types": [
6169
6428
  {
6170
- "type": "infix",
6429
+ "type": "infix_chain",
6171
6430
  "named": true
6172
6431
  }
6173
6432
  ]
@@ -6273,7 +6532,7 @@
6273
6532
  "named": true
6274
6533
  },
6275
6534
  {
6276
- "type": "type",
6535
+ "type": "type_operand",
6277
6536
  "named": true
6278
6537
  }
6279
6538
  ]
@@ -6374,15 +6633,19 @@
6374
6633
  "required": true,
6375
6634
  "types": [
6376
6635
  {
6377
- "type": "binding_pattern",
6636
+ "type": "binding_pattern_operand",
6378
6637
  "named": true
6379
6638
  },
6380
6639
  {
6381
- "type": "expression",
6640
+ "type": "expression_operand",
6382
6641
  "named": true
6383
6642
  },
6384
6643
  {
6385
- "type": "pattern",
6644
+ "type": "operator_chain",
6645
+ "named": true
6646
+ },
6647
+ {
6648
+ "type": "pattern_operand",
6386
6649
  "named": true
6387
6650
  },
6388
6651
  {
@@ -6410,15 +6673,19 @@
6410
6673
  "required": true,
6411
6674
  "types": [
6412
6675
  {
6413
- "type": "binding_pattern",
6676
+ "type": "binding_pattern_operand",
6414
6677
  "named": true
6415
6678
  },
6416
6679
  {
6417
- "type": "expression",
6680
+ "type": "expression_operand",
6418
6681
  "named": true
6419
6682
  },
6420
6683
  {
6421
- "type": "pattern",
6684
+ "type": "operator_chain",
6685
+ "named": true
6686
+ },
6687
+ {
6688
+ "type": "pattern_operand",
6422
6689
  "named": true
6423
6690
  },
6424
6691
  {
@@ -6472,7 +6739,11 @@
6472
6739
  "required": true,
6473
6740
  "types": [
6474
6741
  {
6475
- "type": "expression",
6742
+ "type": "expression_operand",
6743
+ "named": true
6744
+ },
6745
+ {
6746
+ "type": "operator_chain",
6476
6747
  "named": true
6477
6748
  },
6478
6749
  {
@@ -6486,11 +6757,15 @@
6486
6757
  "required": true,
6487
6758
  "types": [
6488
6759
  {
6489
- "type": "binding_pattern",
6760
+ "type": "binding_pattern_operand",
6761
+ "named": true
6762
+ },
6763
+ {
6764
+ "type": "infix_chain",
6490
6765
  "named": true
6491
6766
  },
6492
6767
  {
6493
- "type": "pattern",
6768
+ "type": "pattern_operand",
6494
6769
  "named": true
6495
6770
  },
6496
6771
  {
@@ -6888,6 +7163,10 @@
6888
7163
  "type": "type",
6889
7164
  "named": false
6890
7165
  },
7166
+ {
7167
+ "type": "typed_hole",
7168
+ "named": true
7169
+ },
6891
7170
  {
6892
7171
  "type": "using",
6893
7172
  "named": false