@willbooster/tree-sitter-haskell 9.0.0 → 10.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 +7 -4
  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 +441 -166
  12. package/package.json +1 -1
  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 +441 -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/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
  {
@@ -25,10 +25,6 @@
25
25
  "type": "constructor",
26
26
  "named": true
27
27
  },
28
- {
29
- "type": "infix",
30
- "named": true
31
- },
32
28
  {
33
29
  "type": "irrefutable",
34
30
  "named": true
@@ -146,17 +142,13 @@
146
142
  ]
147
143
  },
148
144
  {
149
- "type": "constraint",
145
+ "type": "constraint_operand",
150
146
  "named": true,
151
147
  "subtypes": [
152
148
  {
153
149
  "type": "apply",
154
150
  "named": true
155
151
  },
156
- {
157
- "type": "infix",
158
- "named": true
159
- },
160
152
  {
161
153
  "type": "literal",
162
154
  "named": true
@@ -228,7 +220,7 @@
228
220
  "named": true,
229
221
  "subtypes": [
230
222
  {
231
- "type": "constraint",
223
+ "type": "constraint_operand",
232
224
  "named": true
233
225
  },
234
226
  {
@@ -243,6 +235,10 @@
243
235
  "type": "implicit_parameter",
244
236
  "named": true
245
237
  },
238
+ {
239
+ "type": "infix_chain",
240
+ "named": true
241
+ },
246
242
  {
247
243
  "type": "signature",
248
244
  "named": true
@@ -358,7 +354,7 @@
358
354
  ]
359
355
  },
360
356
  {
361
- "type": "expression",
357
+ "type": "expression_operand",
362
358
  "named": true,
363
359
  "subtypes": [
364
360
  {
@@ -389,10 +385,6 @@
389
385
  "type": "implicit_variable",
390
386
  "named": true
391
387
  },
392
- {
393
- "type": "infix",
394
- "named": true
395
- },
396
388
  {
397
389
  "type": "label",
398
390
  "named": true
@@ -433,10 +425,6 @@
433
425
  "type": "multi_way_if",
434
426
  "named": true
435
427
  },
436
- {
437
- "type": "negation",
438
- "named": true
439
- },
440
428
  {
441
429
  "type": "parens",
442
430
  "named": true
@@ -568,7 +556,7 @@
568
556
  ]
569
557
  },
570
558
  {
571
- "type": "pattern",
559
+ "type": "pattern_operand",
572
560
  "named": true,
573
561
  "subtypes": [
574
562
  {
@@ -583,10 +571,6 @@
583
571
  "type": "constructor",
584
572
  "named": true
585
573
  },
586
- {
587
- "type": "infix",
588
- "named": true
589
- },
590
574
  {
591
575
  "type": "irrefutable",
592
576
  "named": true
@@ -723,12 +707,16 @@
723
707
  "type": "implicit_parameter",
724
708
  "named": true
725
709
  },
710
+ {
711
+ "type": "infix_chain",
712
+ "named": true
713
+ },
726
714
  {
727
715
  "type": "linear_function",
728
716
  "named": true
729
717
  },
730
718
  {
731
- "type": "type",
719
+ "type": "type_operand",
732
720
  "named": true
733
721
  }
734
722
  ]
@@ -756,17 +744,13 @@
756
744
  ]
757
745
  },
758
746
  {
759
- "type": "type",
747
+ "type": "type_operand",
760
748
  "named": true,
761
749
  "subtypes": [
762
750
  {
763
751
  "type": "apply",
764
752
  "named": true
765
753
  },
766
- {
767
- "type": "infix",
768
- "named": true
769
- },
770
754
  {
771
755
  "type": "list",
772
756
  "named": true
@@ -914,7 +898,11 @@
914
898
  "required": false,
915
899
  "types": [
916
900
  {
917
- "type": "pattern",
901
+ "type": "infix_chain",
902
+ "named": true
903
+ },
904
+ {
905
+ "type": "pattern_operand",
918
906
  "named": true
919
907
  },
920
908
  {
@@ -1004,7 +992,7 @@
1004
992
  "required": true,
1005
993
  "types": [
1006
994
  {
1007
- "type": "binding_pattern",
995
+ "type": "binding_pattern_operand",
1008
996
  "named": true
1009
997
  },
1010
998
  {
@@ -1012,7 +1000,7 @@
1012
1000
  "named": true
1013
1001
  },
1014
1002
  {
1015
- "type": "expression",
1003
+ "type": "expression_operand",
1016
1004
  "named": true
1017
1005
  },
1018
1006
  {
@@ -1020,19 +1008,19 @@
1020
1008
  "named": true
1021
1009
  },
1022
1010
  {
1023
- "type": "pattern",
1011
+ "type": "pattern_operand",
1024
1012
  "named": true
1025
1013
  },
1026
1014
  {
1027
- "type": "type",
1015
+ "type": "type_application",
1028
1016
  "named": true
1029
1017
  },
1030
1018
  {
1031
- "type": "type_application",
1019
+ "type": "type_binder",
1032
1020
  "named": true
1033
1021
  },
1034
1022
  {
1035
- "type": "type_binder",
1023
+ "type": "type_operand",
1036
1024
  "named": true
1037
1025
  }
1038
1026
  ]
@@ -1042,11 +1030,11 @@
1042
1030
  "required": false,
1043
1031
  "types": [
1044
1032
  {
1045
- "type": "constraint",
1033
+ "type": "constraint_operand",
1046
1034
  "named": true
1047
1035
  },
1048
1036
  {
1049
- "type": "type",
1037
+ "type": "type_operand",
1050
1038
  "named": true
1051
1039
  }
1052
1040
  ]
@@ -1056,15 +1044,15 @@
1056
1044
  "required": false,
1057
1045
  "types": [
1058
1046
  {
1059
- "type": "binding_pattern",
1047
+ "type": "binding_pattern_operand",
1060
1048
  "named": true
1061
1049
  },
1062
1050
  {
1063
- "type": "expression",
1051
+ "type": "expression_operand",
1064
1052
  "named": true
1065
1053
  },
1066
1054
  {
1067
- "type": "pattern",
1055
+ "type": "pattern_operand",
1068
1056
  "named": true
1069
1057
  }
1070
1058
  ]
@@ -1080,7 +1068,11 @@
1080
1068
  "required": true,
1081
1069
  "types": [
1082
1070
  {
1083
- "type": "expression",
1071
+ "type": "expression_operand",
1072
+ "named": true
1073
+ },
1074
+ {
1075
+ "type": "operator_chain",
1084
1076
  "named": true
1085
1077
  },
1086
1078
  {
@@ -1094,7 +1086,11 @@
1094
1086
  "required": false,
1095
1087
  "types": [
1096
1088
  {
1097
- "type": "expression",
1089
+ "type": "expression_operand",
1090
+ "named": true
1091
+ },
1092
+ {
1093
+ "type": "operator_chain",
1098
1094
  "named": true
1099
1095
  },
1100
1096
  {
@@ -1108,7 +1104,11 @@
1108
1104
  "required": false,
1109
1105
  "types": [
1110
1106
  {
1111
- "type": "expression",
1107
+ "type": "expression_operand",
1108
+ "named": true
1109
+ },
1110
+ {
1111
+ "type": "operator_chain",
1112
1112
  "named": true
1113
1113
  },
1114
1114
  {
@@ -1138,11 +1138,11 @@
1138
1138
  "required": true,
1139
1139
  "types": [
1140
1140
  {
1141
- "type": "binding_pattern",
1141
+ "type": "binding_pattern_operand",
1142
1142
  "named": true
1143
1143
  },
1144
1144
  {
1145
- "type": "pattern",
1145
+ "type": "pattern_operand",
1146
1146
  "named": true
1147
1147
  }
1148
1148
  ]
@@ -1212,7 +1212,11 @@
1212
1212
  "required": false,
1213
1213
  "types": [
1214
1214
  {
1215
- "type": "expression",
1215
+ "type": "expression_operand",
1216
+ "named": true
1217
+ },
1218
+ {
1219
+ "type": "operator_chain",
1216
1220
  "named": true
1217
1221
  },
1218
1222
  {
@@ -1264,11 +1268,15 @@
1264
1268
  "required": false,
1265
1269
  "types": [
1266
1270
  {
1267
- "type": "binding_pattern",
1271
+ "type": "binding_pattern_operand",
1268
1272
  "named": true
1269
1273
  },
1270
1274
  {
1271
- "type": "pattern",
1275
+ "type": "infix_chain",
1276
+ "named": true
1277
+ },
1278
+ {
1279
+ "type": "pattern_operand",
1272
1280
  "named": true
1273
1281
  },
1274
1282
  {
@@ -1312,7 +1320,11 @@
1312
1320
  "required": true,
1313
1321
  "types": [
1314
1322
  {
1315
- "type": "expression",
1323
+ "type": "expression_operand",
1324
+ "named": true
1325
+ },
1326
+ {
1327
+ "type": "operator_chain",
1316
1328
  "named": true
1317
1329
  },
1318
1330
  {
@@ -1342,7 +1354,11 @@
1342
1354
  "required": true,
1343
1355
  "types": [
1344
1356
  {
1345
- "type": "expression",
1357
+ "type": "expression_operand",
1358
+ "named": true
1359
+ },
1360
+ {
1361
+ "type": "operator_chain",
1346
1362
  "named": true
1347
1363
  },
1348
1364
  {
@@ -1507,7 +1523,11 @@
1507
1523
  "required": true,
1508
1524
  "types": [
1509
1525
  {
1510
- "type": "expression",
1526
+ "type": "expression_operand",
1527
+ "named": true
1528
+ },
1529
+ {
1530
+ "type": "operator_chain",
1511
1531
  "named": true
1512
1532
  },
1513
1533
  {
@@ -1521,7 +1541,11 @@
1521
1541
  "required": true,
1522
1542
  "types": [
1523
1543
  {
1524
- "type": "expression",
1544
+ "type": "expression_operand",
1545
+ "named": true
1546
+ },
1547
+ {
1548
+ "type": "operator_chain",
1525
1549
  "named": true
1526
1550
  },
1527
1551
  {
@@ -1535,7 +1559,11 @@
1535
1559
  "required": true,
1536
1560
  "types": [
1537
1561
  {
1538
- "type": "expression",
1562
+ "type": "expression_operand",
1563
+ "named": true
1564
+ },
1565
+ {
1566
+ "type": "operator_chain",
1539
1567
  "named": true
1540
1568
  },
1541
1569
  {
@@ -1608,7 +1636,11 @@
1608
1636
  "required": false,
1609
1637
  "types": [
1610
1638
  {
1611
- "type": "pattern",
1639
+ "type": "infix_chain",
1640
+ "named": true
1641
+ },
1642
+ {
1643
+ "type": "pattern_operand",
1612
1644
  "named": true
1613
1645
  },
1614
1646
  {
@@ -1667,7 +1699,11 @@
1667
1699
  "required": true,
1668
1700
  "types": [
1669
1701
  {
1670
- "type": "constraint",
1702
+ "type": "constraint_operand",
1703
+ "named": true
1704
+ },
1705
+ {
1706
+ "type": "infix_chain",
1671
1707
  "named": true
1672
1708
  }
1673
1709
  ]
@@ -1888,6 +1924,10 @@
1888
1924
  {
1889
1925
  "type": "infix",
1890
1926
  "named": true
1927
+ },
1928
+ {
1929
+ "type": "infix_chain",
1930
+ "named": true
1891
1931
  }
1892
1932
  ]
1893
1933
  },
@@ -2007,7 +2047,11 @@
2007
2047
  "required": true,
2008
2048
  "types": [
2009
2049
  {
2010
- "type": "constraint",
2050
+ "type": "constraint_operand",
2051
+ "named": true
2052
+ },
2053
+ {
2054
+ "type": "infix_chain",
2011
2055
  "named": true
2012
2056
  }
2013
2057
  ]
@@ -2067,7 +2111,7 @@
2067
2111
  "required": false,
2068
2112
  "types": [
2069
2113
  {
2070
- "type": "infix",
2114
+ "type": "infix_chain",
2071
2115
  "named": true
2072
2116
  }
2073
2117
  ]
@@ -2246,7 +2290,7 @@
2246
2290
  "required": false,
2247
2291
  "types": [
2248
2292
  {
2249
- "type": "infix",
2293
+ "type": "infix_chain",
2250
2294
  "named": true
2251
2295
  }
2252
2296
  ]
@@ -2284,7 +2328,11 @@
2284
2328
  "required": false,
2285
2329
  "types": [
2286
2330
  {
2287
- "type": "pattern",
2331
+ "type": "infix_chain",
2332
+ "named": true
2333
+ },
2334
+ {
2335
+ "type": "pattern_operand",
2288
2336
  "named": true
2289
2337
  },
2290
2338
  {
@@ -2308,7 +2356,11 @@
2308
2356
  "required": false,
2309
2357
  "types": [
2310
2358
  {
2311
- "type": "pattern",
2359
+ "type": "infix_chain",
2360
+ "named": true
2361
+ },
2362
+ {
2363
+ "type": "pattern_operand",
2312
2364
  "named": true
2313
2365
  }
2314
2366
  ]
@@ -2350,7 +2402,11 @@
2350
2402
  "required": true,
2351
2403
  "types": [
2352
2404
  {
2353
- "type": "expression",
2405
+ "type": "expression_operand",
2406
+ "named": true
2407
+ },
2408
+ {
2409
+ "type": "operator_chain",
2354
2410
  "named": true
2355
2411
  },
2356
2412
  {
@@ -2369,7 +2425,11 @@
2369
2425
  "required": true,
2370
2426
  "types": [
2371
2427
  {
2372
- "type": "type",
2428
+ "type": "infix_chain",
2429
+ "named": true
2430
+ },
2431
+ {
2432
+ "type": "type_operand",
2373
2433
  "named": true
2374
2434
  }
2375
2435
  ]
@@ -2522,7 +2582,11 @@
2522
2582
  "required": false,
2523
2583
  "types": [
2524
2584
  {
2525
- "type": "type",
2585
+ "type": "infix_chain",
2586
+ "named": true
2587
+ },
2588
+ {
2589
+ "type": "type_operand",
2526
2590
  "named": true
2527
2591
  }
2528
2592
  ]
@@ -2596,11 +2660,15 @@
2596
2660
  "required": false,
2597
2661
  "types": [
2598
2662
  {
2599
- "type": "binding_pattern",
2663
+ "type": "binding_pattern_operand",
2600
2664
  "named": true
2601
2665
  },
2602
2666
  {
2603
- "type": "pattern",
2667
+ "type": "infix_chain",
2668
+ "named": true
2669
+ },
2670
+ {
2671
+ "type": "pattern_operand",
2604
2672
  "named": true
2605
2673
  },
2606
2674
  {
@@ -2634,7 +2702,11 @@
2634
2702
  "required": false,
2635
2703
  "types": [
2636
2704
  {
2637
- "type": "expression",
2705
+ "type": "expression_operand",
2706
+ "named": true
2707
+ },
2708
+ {
2709
+ "type": "operator_chain",
2638
2710
  "named": true
2639
2711
  },
2640
2712
  {
@@ -3168,7 +3240,11 @@
3168
3240
  "required": true,
3169
3241
  "types": [
3170
3242
  {
3171
- "type": "expression",
3243
+ "type": "expression_operand",
3244
+ "named": true
3245
+ },
3246
+ {
3247
+ "type": "operator_chain",
3172
3248
  "named": true
3173
3249
  },
3174
3250
  {
@@ -3182,7 +3258,11 @@
3182
3258
  "required": true,
3183
3259
  "types": [
3184
3260
  {
3185
- "type": "pattern",
3261
+ "type": "infix_chain",
3262
+ "named": true
3263
+ },
3264
+ {
3265
+ "type": "pattern_operand",
3186
3266
  "named": true
3187
3267
  },
3188
3268
  {
@@ -3202,7 +3282,11 @@
3202
3282
  "required": true,
3203
3283
  "types": [
3204
3284
  {
3205
- "type": "expression",
3285
+ "type": "expression_operand",
3286
+ "named": true
3287
+ },
3288
+ {
3289
+ "type": "operator_chain",
3206
3290
  "named": true
3207
3291
  },
3208
3292
  {
@@ -3216,7 +3300,11 @@
3216
3300
  "required": false,
3217
3301
  "types": [
3218
3302
  {
3219
- "type": "expression",
3303
+ "type": "expression_operand",
3304
+ "named": true
3305
+ },
3306
+ {
3307
+ "type": "operator_chain",
3220
3308
  "named": true
3221
3309
  },
3222
3310
  {
@@ -3547,11 +3635,7 @@
3547
3635
  "required": true,
3548
3636
  "types": [
3549
3637
  {
3550
- "type": "binding_pattern",
3551
- "named": true
3552
- },
3553
- {
3554
- "type": "expression",
3638
+ "type": "infix_chain",
3555
3639
  "named": true
3556
3640
  },
3557
3641
  {
@@ -3559,7 +3643,7 @@
3559
3643
  "named": true
3560
3644
  },
3561
3645
  {
3562
- "type": "pattern",
3646
+ "type": "pattern_operand",
3563
3647
  "named": true
3564
3648
  },
3565
3649
  {
@@ -3567,7 +3651,7 @@
3567
3651
  "named": true
3568
3652
  },
3569
3653
  {
3570
- "type": "type",
3654
+ "type": "type_operand",
3571
3655
  "named": true
3572
3656
  },
3573
3657
  {
@@ -3592,10 +3676,6 @@
3592
3676
  "type": "operator",
3593
3677
  "named": true
3594
3678
  },
3595
- {
3596
- "type": "promoted",
3597
- "named": true
3598
- },
3599
3679
  {
3600
3680
  "type": "qualified",
3601
3681
  "named": true
@@ -3607,11 +3687,7 @@
3607
3687
  "required": true,
3608
3688
  "types": [
3609
3689
  {
3610
- "type": "binding_pattern",
3611
- "named": true
3612
- },
3613
- {
3614
- "type": "expression",
3690
+ "type": "infix_chain",
3615
3691
  "named": true
3616
3692
  },
3617
3693
  {
@@ -3619,7 +3695,7 @@
3619
3695
  "named": true
3620
3696
  },
3621
3697
  {
3622
- "type": "pattern",
3698
+ "type": "pattern_operand",
3623
3699
  "named": true
3624
3700
  },
3625
3701
  {
@@ -3627,7 +3703,7 @@
3627
3703
  "named": true
3628
3704
  },
3629
3705
  {
3630
- "type": "type",
3706
+ "type": "type_operand",
3631
3707
  "named": true
3632
3708
  },
3633
3709
  {
@@ -3638,6 +3714,56 @@
3638
3714
  }
3639
3715
  }
3640
3716
  },
3717
+ {
3718
+ "type": "infix_chain",
3719
+ "named": true,
3720
+ "fields": {
3721
+ "operand": {
3722
+ "multiple": true,
3723
+ "required": true,
3724
+ "types": [
3725
+ {
3726
+ "type": "binding_pattern_operand",
3727
+ "named": true
3728
+ },
3729
+ {
3730
+ "type": "pattern_operand",
3731
+ "named": true
3732
+ },
3733
+ {
3734
+ "type": "type_operand",
3735
+ "named": true
3736
+ }
3737
+ ]
3738
+ },
3739
+ "operator": {
3740
+ "multiple": true,
3741
+ "required": true,
3742
+ "types": [
3743
+ {
3744
+ "type": "constructor_operator",
3745
+ "named": true
3746
+ },
3747
+ {
3748
+ "type": "infix_id",
3749
+ "named": true
3750
+ },
3751
+ {
3752
+ "type": "operator",
3753
+ "named": true
3754
+ },
3755
+ {
3756
+ "type": "promoted",
3757
+ "named": true
3758
+ },
3759
+ {
3760
+ "type": "qualified",
3761
+ "named": true
3762
+ }
3763
+ ]
3764
+ }
3765
+ }
3766
+ },
3641
3767
  {
3642
3768
  "type": "infix_id",
3643
3769
  "named": true,
@@ -3708,7 +3834,7 @@
3708
3834
  "required": false,
3709
3835
  "types": [
3710
3836
  {
3711
- "type": "infix",
3837
+ "type": "infix_chain",
3712
3838
  "named": true
3713
3839
  }
3714
3840
  ]
@@ -3799,11 +3925,11 @@
3799
3925
  "required": true,
3800
3926
  "types": [
3801
3927
  {
3802
- "type": "binding_pattern",
3928
+ "type": "binding_pattern_operand",
3803
3929
  "named": true
3804
3930
  },
3805
3931
  {
3806
- "type": "pattern",
3932
+ "type": "pattern_operand",
3807
3933
  "named": true
3808
3934
  }
3809
3935
  ]
@@ -3819,7 +3945,7 @@
3819
3945
  "required": true,
3820
3946
  "types": [
3821
3947
  {
3822
- "type": "type",
3948
+ "type": "type_operand",
3823
3949
  "named": true
3824
3950
  }
3825
3951
  ]
@@ -3893,7 +4019,11 @@
3893
4019
  "required": true,
3894
4020
  "types": [
3895
4021
  {
3896
- "type": "expression",
4022
+ "type": "expression_operand",
4023
+ "named": true
4024
+ },
4025
+ {
4026
+ "type": "operator_chain",
3897
4027
  "named": true
3898
4028
  },
3899
4029
  {
@@ -3955,7 +4085,11 @@
3955
4085
  "required": true,
3956
4086
  "types": [
3957
4087
  {
3958
- "type": "type",
4088
+ "type": "infix_chain",
4089
+ "named": true
4090
+ },
4091
+ {
4092
+ "type": "type_operand",
3959
4093
  "named": true
3960
4094
  }
3961
4095
  ]
@@ -3971,7 +4105,11 @@
3971
4105
  "required": true,
3972
4106
  "types": [
3973
4107
  {
3974
- "type": "expression",
4108
+ "type": "expression_operand",
4109
+ "named": true
4110
+ },
4111
+ {
4112
+ "type": "operator_chain",
3975
4113
  "named": true
3976
4114
  }
3977
4115
  ]
@@ -4035,7 +4173,11 @@
4035
4173
  "required": true,
4036
4174
  "types": [
4037
4175
  {
4038
- "type": "expression",
4176
+ "type": "expression_operand",
4177
+ "named": true
4178
+ },
4179
+ {
4180
+ "type": "operator_chain",
4039
4181
  "named": true
4040
4182
  },
4041
4183
  {
@@ -4121,15 +4263,19 @@
4121
4263
  "required": false,
4122
4264
  "types": [
4123
4265
  {
4124
- "type": "binding_pattern",
4266
+ "type": "binding_pattern_operand",
4267
+ "named": true
4268
+ },
4269
+ {
4270
+ "type": "expression_operand",
4125
4271
  "named": true
4126
4272
  },
4127
4273
  {
4128
- "type": "expression",
4274
+ "type": "operator_chain",
4129
4275
  "named": true
4130
4276
  },
4131
4277
  {
4132
- "type": "pattern",
4278
+ "type": "pattern_operand",
4133
4279
  "named": true
4134
4280
  },
4135
4281
  {
@@ -4157,7 +4303,11 @@
4157
4303
  "required": true,
4158
4304
  "types": [
4159
4305
  {
4160
- "type": "expression",
4306
+ "type": "expression_operand",
4307
+ "named": true
4308
+ },
4309
+ {
4310
+ "type": "operator_chain",
4161
4311
  "named": true
4162
4312
  },
4163
4313
  {
@@ -4234,7 +4384,11 @@
4234
4384
  "required": true,
4235
4385
  "types": [
4236
4386
  {
4237
- "type": "expression",
4387
+ "type": "expression_operand",
4388
+ "named": true
4389
+ },
4390
+ {
4391
+ "type": "operator_chain",
4238
4392
  "named": true
4239
4393
  },
4240
4394
  {
@@ -4264,7 +4418,11 @@
4264
4418
  "required": true,
4265
4419
  "types": [
4266
4420
  {
4267
- "type": "type",
4421
+ "type": "infix_chain",
4422
+ "named": true
4423
+ },
4424
+ {
4425
+ "type": "type_operand",
4268
4426
  "named": true
4269
4427
  }
4270
4428
  ]
@@ -4326,29 +4484,9 @@
4326
4484
  "type": "negation",
4327
4485
  "named": true,
4328
4486
  "fields": {
4329
- "expression": {
4330
- "multiple": false,
4331
- "required": false,
4332
- "types": [
4333
- {
4334
- "type": "expression",
4335
- "named": true
4336
- }
4337
- ]
4338
- },
4339
- "minus": {
4340
- "multiple": false,
4341
- "required": false,
4342
- "types": [
4343
- {
4344
- "type": "-",
4345
- "named": false
4346
- }
4347
- ]
4348
- },
4349
4487
  "number": {
4350
4488
  "multiple": false,
4351
- "required": false,
4489
+ "required": true,
4352
4490
  "types": [
4353
4491
  {
4354
4492
  "type": "float",
@@ -4427,6 +4565,10 @@
4427
4565
  {
4428
4566
  "type": "infix",
4429
4567
  "named": true
4568
+ },
4569
+ {
4570
+ "type": "infix_chain",
4571
+ "named": true
4430
4572
  }
4431
4573
  ]
4432
4574
  },
@@ -4521,6 +4663,54 @@
4521
4663
  "named": true,
4522
4664
  "fields": {}
4523
4665
  },
4666
+ {
4667
+ "type": "operator_chain",
4668
+ "named": true,
4669
+ "fields": {
4670
+ "operand": {
4671
+ "multiple": true,
4672
+ "required": true,
4673
+ "types": [
4674
+ {
4675
+ "type": "expression_operand",
4676
+ "named": true
4677
+ }
4678
+ ]
4679
+ },
4680
+ "operator": {
4681
+ "multiple": true,
4682
+ "required": false,
4683
+ "types": [
4684
+ {
4685
+ "type": "constructor_operator",
4686
+ "named": true
4687
+ },
4688
+ {
4689
+ "type": "infix_id",
4690
+ "named": true
4691
+ },
4692
+ {
4693
+ "type": "operator",
4694
+ "named": true
4695
+ },
4696
+ {
4697
+ "type": "qualified",
4698
+ "named": true
4699
+ }
4700
+ ]
4701
+ },
4702
+ "prefix_operator": {
4703
+ "multiple": true,
4704
+ "required": false,
4705
+ "types": [
4706
+ {
4707
+ "type": "prefix_negation",
4708
+ "named": true
4709
+ }
4710
+ ]
4711
+ }
4712
+ }
4713
+ },
4524
4714
  {
4525
4715
  "type": "parens",
4526
4716
  "named": true,
@@ -4540,7 +4730,11 @@
4540
4730
  "required": false,
4541
4731
  "types": [
4542
4732
  {
4543
- "type": "expression",
4733
+ "type": "expression_operand",
4734
+ "named": true
4735
+ },
4736
+ {
4737
+ "type": "operator_chain",
4544
4738
  "named": true
4545
4739
  },
4546
4740
  {
@@ -4554,11 +4748,15 @@
4554
4748
  "required": false,
4555
4749
  "types": [
4556
4750
  {
4557
- "type": "binding_pattern",
4751
+ "type": "binding_pattern_operand",
4558
4752
  "named": true
4559
4753
  },
4560
4754
  {
4561
- "type": "pattern",
4755
+ "type": "infix_chain",
4756
+ "named": true
4757
+ },
4758
+ {
4759
+ "type": "pattern_operand",
4562
4760
  "named": true
4563
4761
  },
4564
4762
  {
@@ -4659,7 +4857,11 @@
4659
4857
  "required": true,
4660
4858
  "types": [
4661
4859
  {
4662
- "type": "expression",
4860
+ "type": "expression_operand",
4861
+ "named": true
4862
+ },
4863
+ {
4864
+ "type": "operator_chain",
4663
4865
  "named": true
4664
4866
  },
4665
4867
  {
@@ -4673,7 +4875,11 @@
4673
4875
  "required": true,
4674
4876
  "types": [
4675
4877
  {
4676
- "type": "pattern",
4878
+ "type": "infix_chain",
4879
+ "named": true
4880
+ },
4881
+ {
4882
+ "type": "pattern_operand",
4677
4883
  "named": true
4678
4884
  },
4679
4885
  {
@@ -4716,7 +4922,7 @@
4716
4922
  "named": true
4717
4923
  },
4718
4924
  {
4719
- "type": "pattern",
4925
+ "type": "pattern_operand",
4720
4926
  "named": true
4721
4927
  },
4722
4928
  {
@@ -4734,6 +4940,10 @@
4734
4940
  "multiple": true,
4735
4941
  "required": false,
4736
4942
  "types": [
4943
+ {
4944
+ "type": "infix_chain",
4945
+ "named": true
4946
+ },
4737
4947
  {
4738
4948
  "type": "lazy_field",
4739
4949
  "named": true
@@ -4743,7 +4953,7 @@
4743
4953
  "named": true
4744
4954
  },
4745
4955
  {
4746
- "type": "type",
4956
+ "type": "type_operand",
4747
4957
  "named": true
4748
4958
  }
4749
4959
  ]
@@ -4802,6 +5012,11 @@
4802
5012
  "named": true,
4803
5013
  "fields": {}
4804
5014
  },
5015
+ {
5016
+ "type": "prefix_negation",
5017
+ "named": true,
5018
+ "fields": {}
5019
+ },
4805
5020
  {
4806
5021
  "type": "prefix_tuple",
4807
5022
  "named": true,
@@ -4826,7 +5041,7 @@
4826
5041
  "required": true,
4827
5042
  "types": [
4828
5043
  {
4829
- "type": "expression",
5044
+ "type": "expression_operand",
4830
5045
  "named": true
4831
5046
  }
4832
5047
  ]
@@ -5187,7 +5402,11 @@
5187
5402
  "required": true,
5188
5403
  "types": [
5189
5404
  {
5190
- "type": "expression",
5405
+ "type": "expression_operand",
5406
+ "named": true
5407
+ },
5408
+ {
5409
+ "type": "operator_chain",
5191
5410
  "named": true
5192
5411
  },
5193
5412
  {
@@ -5206,7 +5425,11 @@
5206
5425
  "required": true,
5207
5426
  "types": [
5208
5427
  {
5209
- "type": "pattern",
5428
+ "type": "infix_chain",
5429
+ "named": true
5430
+ },
5431
+ {
5432
+ "type": "pattern_operand",
5210
5433
  "named": true
5211
5434
  },
5212
5435
  {
@@ -5293,11 +5516,11 @@
5293
5516
  "required": false,
5294
5517
  "types": [
5295
5518
  {
5296
- "type": "binding_pattern",
5519
+ "type": "binding_pattern_operand",
5297
5520
  "named": true
5298
5521
  },
5299
5522
  {
5300
- "type": "pattern",
5523
+ "type": "pattern_operand",
5301
5524
  "named": true
5302
5525
  }
5303
5526
  ]
@@ -5307,7 +5530,7 @@
5307
5530
  "required": false,
5308
5531
  "types": [
5309
5532
  {
5310
- "type": "expression",
5533
+ "type": "expression_operand",
5311
5534
  "named": true
5312
5535
  }
5313
5536
  ]
@@ -5371,7 +5594,11 @@
5371
5594
  "required": true,
5372
5595
  "types": [
5373
5596
  {
5374
- "type": "expression",
5597
+ "type": "expression_operand",
5598
+ "named": true
5599
+ },
5600
+ {
5601
+ "type": "operator_chain",
5375
5602
  "named": true
5376
5603
  }
5377
5604
  ]
@@ -5453,7 +5680,11 @@
5453
5680
  "required": false,
5454
5681
  "types": [
5455
5682
  {
5456
- "type": "expression",
5683
+ "type": "expression_operand",
5684
+ "named": true
5685
+ },
5686
+ {
5687
+ "type": "operator_chain",
5457
5688
  "named": true
5458
5689
  }
5459
5690
  ]
@@ -5497,11 +5728,15 @@
5497
5728
  "required": false,
5498
5729
  "types": [
5499
5730
  {
5500
- "type": "binding_pattern",
5731
+ "type": "binding_pattern_operand",
5732
+ "named": true
5733
+ },
5734
+ {
5735
+ "type": "infix_chain",
5501
5736
  "named": true
5502
5737
  },
5503
5738
  {
5504
- "type": "pattern",
5739
+ "type": "pattern_operand",
5505
5740
  "named": true
5506
5741
  }
5507
5742
  ]
@@ -5629,11 +5864,11 @@
5629
5864
  "required": true,
5630
5865
  "types": [
5631
5866
  {
5632
- "type": "binding_pattern",
5867
+ "type": "binding_pattern_operand",
5633
5868
  "named": true
5634
5869
  },
5635
5870
  {
5636
- "type": "pattern",
5871
+ "type": "pattern_operand",
5637
5872
  "named": true
5638
5873
  }
5639
5874
  ]
@@ -5649,7 +5884,11 @@
5649
5884
  "required": true,
5650
5885
  "types": [
5651
5886
  {
5652
- "type": "type",
5887
+ "type": "infix_chain",
5888
+ "named": true
5889
+ },
5890
+ {
5891
+ "type": "type_operand",
5653
5892
  "named": true
5654
5893
  }
5655
5894
  ]
@@ -5687,7 +5926,11 @@
5687
5926
  "required": false,
5688
5927
  "types": [
5689
5928
  {
5690
- "type": "type",
5929
+ "type": "infix_chain",
5930
+ "named": true
5931
+ },
5932
+ {
5933
+ "type": "type_operand",
5691
5934
  "named": true
5692
5935
  }
5693
5936
  ]
@@ -5703,7 +5946,11 @@
5703
5946
  "required": true,
5704
5947
  "types": [
5705
5948
  {
5706
- "type": "expression",
5949
+ "type": "expression_operand",
5950
+ "named": true
5951
+ },
5952
+ {
5953
+ "type": "operator_chain",
5707
5954
  "named": true
5708
5955
  }
5709
5956
  ]
@@ -5718,7 +5965,11 @@
5718
5965
  "required": false,
5719
5966
  "types": [
5720
5967
  {
5721
- "type": "expression",
5968
+ "type": "expression_operand",
5969
+ "named": true
5970
+ },
5971
+ {
5972
+ "type": "operator_chain",
5722
5973
  "named": true
5723
5974
  },
5724
5975
  {
@@ -5732,7 +5983,11 @@
5732
5983
  "required": true,
5733
5984
  "types": [
5734
5985
  {
5735
- "type": "expression",
5986
+ "type": "expression_operand",
5987
+ "named": true
5988
+ },
5989
+ {
5990
+ "type": "operator_chain",
5736
5991
  "named": true
5737
5992
  },
5738
5993
  {
@@ -5752,15 +6007,19 @@
5752
6007
  "required": false,
5753
6008
  "types": [
5754
6009
  {
5755
- "type": "binding_pattern",
6010
+ "type": "binding_pattern_operand",
6011
+ "named": true
6012
+ },
6013
+ {
6014
+ "type": "expression_operand",
5756
6015
  "named": true
5757
6016
  },
5758
6017
  {
5759
- "type": "expression",
6018
+ "type": "operator_chain",
5760
6019
  "named": true
5761
6020
  },
5762
6021
  {
5763
- "type": "pattern",
6022
+ "type": "pattern_operand",
5764
6023
  "named": true
5765
6024
  },
5766
6025
  {
@@ -5798,7 +6057,7 @@
5798
6057
  "required": true,
5799
6058
  "types": [
5800
6059
  {
5801
- "type": "type",
6060
+ "type": "type_operand",
5802
6061
  "named": true
5803
6062
  }
5804
6063
  ]
@@ -5814,7 +6073,7 @@
5814
6073
  "required": true,
5815
6074
  "types": [
5816
6075
  {
5817
- "type": "type",
6076
+ "type": "type_operand",
5818
6077
  "named": true
5819
6078
  }
5820
6079
  ]
@@ -5972,7 +6231,7 @@
5972
6231
  "required": false,
5973
6232
  "types": [
5974
6233
  {
5975
- "type": "infix",
6234
+ "type": "infix_chain",
5976
6235
  "named": true
5977
6236
  }
5978
6237
  ]
@@ -6074,7 +6333,7 @@
6074
6333
  "named": true
6075
6334
  },
6076
6335
  {
6077
- "type": "type",
6336
+ "type": "type_operand",
6078
6337
  "named": true
6079
6338
  }
6080
6339
  ]
@@ -6171,15 +6430,19 @@
6171
6430
  "required": true,
6172
6431
  "types": [
6173
6432
  {
6174
- "type": "binding_pattern",
6433
+ "type": "binding_pattern_operand",
6434
+ "named": true
6435
+ },
6436
+ {
6437
+ "type": "expression_operand",
6175
6438
  "named": true
6176
6439
  },
6177
6440
  {
6178
- "type": "expression",
6441
+ "type": "operator_chain",
6179
6442
  "named": true
6180
6443
  },
6181
6444
  {
6182
- "type": "pattern",
6445
+ "type": "pattern_operand",
6183
6446
  "named": true
6184
6447
  },
6185
6448
  {
@@ -6207,15 +6470,19 @@
6207
6470
  "required": true,
6208
6471
  "types": [
6209
6472
  {
6210
- "type": "binding_pattern",
6473
+ "type": "binding_pattern_operand",
6211
6474
  "named": true
6212
6475
  },
6213
6476
  {
6214
- "type": "expression",
6477
+ "type": "expression_operand",
6215
6478
  "named": true
6216
6479
  },
6217
6480
  {
6218
- "type": "pattern",
6481
+ "type": "operator_chain",
6482
+ "named": true
6483
+ },
6484
+ {
6485
+ "type": "pattern_operand",
6219
6486
  "named": true
6220
6487
  },
6221
6488
  {
@@ -6269,7 +6536,11 @@
6269
6536
  "required": true,
6270
6537
  "types": [
6271
6538
  {
6272
- "type": "expression",
6539
+ "type": "expression_operand",
6540
+ "named": true
6541
+ },
6542
+ {
6543
+ "type": "operator_chain",
6273
6544
  "named": true
6274
6545
  },
6275
6546
  {
@@ -6283,11 +6554,15 @@
6283
6554
  "required": true,
6284
6555
  "types": [
6285
6556
  {
6286
- "type": "binding_pattern",
6557
+ "type": "binding_pattern_operand",
6558
+ "named": true
6559
+ },
6560
+ {
6561
+ "type": "infix_chain",
6287
6562
  "named": true
6288
6563
  },
6289
6564
  {
6290
- "type": "pattern",
6565
+ "type": "pattern_operand",
6291
6566
  "named": true
6292
6567
  },
6293
6568
  {