@willbooster/tree-sitter-haskell 8.3.1 → 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 (21) hide show
  1. package/README.md +12 -8
  2. package/grammar/comment.js +13 -0
  3. package/grammar/conflicts.js +22 -19
  4. package/grammar/context.js +8 -9
  5. package/grammar/exp.js +29 -27
  6. package/grammar/externals.js +5 -9
  7. package/grammar/inline.js +7 -0
  8. package/grammar/pat.js +20 -13
  9. package/grammar/precedences.js +0 -1
  10. package/grammar/type.js +13 -10
  11. package/grammar.js +7 -14
  12. package/hsc/src/node-types.json +490 -173
  13. package/package.json +3 -3
  14. package/queries/highlights.scm +36 -65
  15. package/queries/injections.scm +1 -1
  16. package/queries/locals.scm +3 -3
  17. package/queries/tags.scm +35 -19
  18. package/src/node-types.json +490 -173
  19. package/tree-sitter-haskell.wasm +0 -0
  20. package/tree-sitter-hsc.wasm +0 -0
  21. 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
  {
@@ -1518,6 +1534,22 @@
1518
1534
  }
1519
1535
  }
1520
1536
  },
1537
+ {
1538
+ "type": "comment",
1539
+ "named": true,
1540
+ "extra": true,
1541
+ "fields": {},
1542
+ "children": {
1543
+ "multiple": false,
1544
+ "required": true,
1545
+ "types": [
1546
+ {
1547
+ "type": "content",
1548
+ "named": true
1549
+ }
1550
+ ]
1551
+ }
1552
+ },
1521
1553
  {
1522
1554
  "type": "conditional",
1523
1555
  "named": true,
@@ -1527,7 +1559,11 @@
1527
1559
  "required": true,
1528
1560
  "types": [
1529
1561
  {
1530
- "type": "expression",
1562
+ "type": "expression_operand",
1563
+ "named": true
1564
+ },
1565
+ {
1566
+ "type": "operator_chain",
1531
1567
  "named": true
1532
1568
  },
1533
1569
  {
@@ -1541,7 +1577,11 @@
1541
1577
  "required": true,
1542
1578
  "types": [
1543
1579
  {
1544
- "type": "expression",
1580
+ "type": "expression_operand",
1581
+ "named": true
1582
+ },
1583
+ {
1584
+ "type": "operator_chain",
1545
1585
  "named": true
1546
1586
  },
1547
1587
  {
@@ -1555,7 +1595,11 @@
1555
1595
  "required": true,
1556
1596
  "types": [
1557
1597
  {
1558
- "type": "expression",
1598
+ "type": "expression_operand",
1599
+ "named": true
1600
+ },
1601
+ {
1602
+ "type": "operator_chain",
1559
1603
  "named": true
1560
1604
  },
1561
1605
  {
@@ -1632,7 +1676,11 @@
1632
1676
  "required": false,
1633
1677
  "types": [
1634
1678
  {
1635
- "type": "pattern",
1679
+ "type": "infix_chain",
1680
+ "named": true
1681
+ },
1682
+ {
1683
+ "type": "pattern_operand",
1636
1684
  "named": true
1637
1685
  },
1638
1686
  {
@@ -1691,7 +1739,11 @@
1691
1739
  "required": true,
1692
1740
  "types": [
1693
1741
  {
1694
- "type": "constraint",
1742
+ "type": "constraint_operand",
1743
+ "named": true
1744
+ },
1745
+ {
1746
+ "type": "infix_chain",
1695
1747
  "named": true
1696
1748
  }
1697
1749
  ]
@@ -1916,6 +1968,10 @@
1916
1968
  {
1917
1969
  "type": "infix",
1918
1970
  "named": true
1971
+ },
1972
+ {
1973
+ "type": "infix_chain",
1974
+ "named": true
1919
1975
  }
1920
1976
  ]
1921
1977
  },
@@ -2039,7 +2095,11 @@
2039
2095
  "required": true,
2040
2096
  "types": [
2041
2097
  {
2042
- "type": "constraint",
2098
+ "type": "constraint_operand",
2099
+ "named": true
2100
+ },
2101
+ {
2102
+ "type": "infix_chain",
2043
2103
  "named": true
2044
2104
  }
2045
2105
  ]
@@ -2099,7 +2159,7 @@
2099
2159
  "required": false,
2100
2160
  "types": [
2101
2161
  {
2102
- "type": "infix",
2162
+ "type": "infix_chain",
2103
2163
  "named": true
2104
2164
  }
2105
2165
  ]
@@ -2286,7 +2346,7 @@
2286
2346
  "required": false,
2287
2347
  "types": [
2288
2348
  {
2289
- "type": "infix",
2349
+ "type": "infix_chain",
2290
2350
  "named": true
2291
2351
  }
2292
2352
  ]
@@ -2328,7 +2388,11 @@
2328
2388
  "required": false,
2329
2389
  "types": [
2330
2390
  {
2331
- "type": "pattern",
2391
+ "type": "infix_chain",
2392
+ "named": true
2393
+ },
2394
+ {
2395
+ "type": "pattern_operand",
2332
2396
  "named": true
2333
2397
  },
2334
2398
  {
@@ -2352,7 +2416,11 @@
2352
2416
  "required": false,
2353
2417
  "types": [
2354
2418
  {
2355
- "type": "pattern",
2419
+ "type": "infix_chain",
2420
+ "named": true
2421
+ },
2422
+ {
2423
+ "type": "pattern_operand",
2356
2424
  "named": true
2357
2425
  }
2358
2426
  ]
@@ -2394,7 +2462,11 @@
2394
2462
  "required": true,
2395
2463
  "types": [
2396
2464
  {
2397
- "type": "expression",
2465
+ "type": "expression_operand",
2466
+ "named": true
2467
+ },
2468
+ {
2469
+ "type": "operator_chain",
2398
2470
  "named": true
2399
2471
  },
2400
2472
  {
@@ -2413,7 +2485,11 @@
2413
2485
  "required": true,
2414
2486
  "types": [
2415
2487
  {
2416
- "type": "type",
2488
+ "type": "infix_chain",
2489
+ "named": true
2490
+ },
2491
+ {
2492
+ "type": "type_operand",
2417
2493
  "named": true
2418
2494
  }
2419
2495
  ]
@@ -2576,7 +2652,11 @@
2576
2652
  "required": false,
2577
2653
  "types": [
2578
2654
  {
2579
- "type": "type",
2655
+ "type": "infix_chain",
2656
+ "named": true
2657
+ },
2658
+ {
2659
+ "type": "type_operand",
2580
2660
  "named": true
2581
2661
  }
2582
2662
  ]
@@ -2650,11 +2730,15 @@
2650
2730
  "required": false,
2651
2731
  "types": [
2652
2732
  {
2653
- "type": "binding_pattern",
2733
+ "type": "binding_pattern_operand",
2734
+ "named": true
2735
+ },
2736
+ {
2737
+ "type": "infix_chain",
2654
2738
  "named": true
2655
2739
  },
2656
2740
  {
2657
- "type": "pattern",
2741
+ "type": "pattern_operand",
2658
2742
  "named": true
2659
2743
  },
2660
2744
  {
@@ -2688,7 +2772,11 @@
2688
2772
  "required": false,
2689
2773
  "types": [
2690
2774
  {
2691
- "type": "expression",
2775
+ "type": "expression_operand",
2776
+ "named": true
2777
+ },
2778
+ {
2779
+ "type": "operator_chain",
2692
2780
  "named": true
2693
2781
  },
2694
2782
  {
@@ -3242,7 +3330,11 @@
3242
3330
  "required": true,
3243
3331
  "types": [
3244
3332
  {
3245
- "type": "expression",
3333
+ "type": "expression_operand",
3334
+ "named": true
3335
+ },
3336
+ {
3337
+ "type": "operator_chain",
3246
3338
  "named": true
3247
3339
  },
3248
3340
  {
@@ -3256,7 +3348,11 @@
3256
3348
  "required": true,
3257
3349
  "types": [
3258
3350
  {
3259
- "type": "pattern",
3351
+ "type": "infix_chain",
3352
+ "named": true
3353
+ },
3354
+ {
3355
+ "type": "pattern_operand",
3260
3356
  "named": true
3261
3357
  },
3262
3358
  {
@@ -3276,7 +3372,11 @@
3276
3372
  "required": true,
3277
3373
  "types": [
3278
3374
  {
3279
- "type": "expression",
3375
+ "type": "expression_operand",
3376
+ "named": true
3377
+ },
3378
+ {
3379
+ "type": "operator_chain",
3280
3380
  "named": true
3281
3381
  },
3282
3382
  {
@@ -3290,7 +3390,11 @@
3290
3390
  "required": false,
3291
3391
  "types": [
3292
3392
  {
3293
- "type": "expression",
3393
+ "type": "expression_operand",
3394
+ "named": true
3395
+ },
3396
+ {
3397
+ "type": "operator_chain",
3294
3398
  "named": true
3295
3399
  },
3296
3400
  {
@@ -3317,6 +3421,22 @@
3317
3421
  }
3318
3422
  }
3319
3423
  },
3424
+ {
3425
+ "type": "haddock",
3426
+ "named": true,
3427
+ "extra": true,
3428
+ "fields": {},
3429
+ "children": {
3430
+ "multiple": false,
3431
+ "required": true,
3432
+ "types": [
3433
+ {
3434
+ "type": "content",
3435
+ "named": true
3436
+ }
3437
+ ]
3438
+ }
3439
+ },
3320
3440
  {
3321
3441
  "type": "haskell",
3322
3442
  "named": true,
@@ -3641,11 +3761,7 @@
3641
3761
  "required": true,
3642
3762
  "types": [
3643
3763
  {
3644
- "type": "binding_pattern",
3645
- "named": true
3646
- },
3647
- {
3648
- "type": "expression",
3764
+ "type": "infix_chain",
3649
3765
  "named": true
3650
3766
  },
3651
3767
  {
@@ -3653,7 +3769,7 @@
3653
3769
  "named": true
3654
3770
  },
3655
3771
  {
3656
- "type": "pattern",
3772
+ "type": "pattern_operand",
3657
3773
  "named": true
3658
3774
  },
3659
3775
  {
@@ -3661,7 +3777,7 @@
3661
3777
  "named": true
3662
3778
  },
3663
3779
  {
3664
- "type": "type",
3780
+ "type": "type_operand",
3665
3781
  "named": true
3666
3782
  },
3667
3783
  {
@@ -3686,10 +3802,6 @@
3686
3802
  "type": "operator",
3687
3803
  "named": true
3688
3804
  },
3689
- {
3690
- "type": "promoted",
3691
- "named": true
3692
- },
3693
3805
  {
3694
3806
  "type": "qualified",
3695
3807
  "named": true
@@ -3701,11 +3813,7 @@
3701
3813
  "required": true,
3702
3814
  "types": [
3703
3815
  {
3704
- "type": "binding_pattern",
3705
- "named": true
3706
- },
3707
- {
3708
- "type": "expression",
3816
+ "type": "infix_chain",
3709
3817
  "named": true
3710
3818
  },
3711
3819
  {
@@ -3713,7 +3821,7 @@
3713
3821
  "named": true
3714
3822
  },
3715
3823
  {
3716
- "type": "pattern",
3824
+ "type": "pattern_operand",
3717
3825
  "named": true
3718
3826
  },
3719
3827
  {
@@ -3721,7 +3829,7 @@
3721
3829
  "named": true
3722
3830
  },
3723
3831
  {
3724
- "type": "type",
3832
+ "type": "type_operand",
3725
3833
  "named": true
3726
3834
  },
3727
3835
  {
@@ -3732,6 +3840,56 @@
3732
3840
  }
3733
3841
  }
3734
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
+ },
3735
3893
  {
3736
3894
  "type": "infix_id",
3737
3895
  "named": true,
@@ -3802,7 +3960,7 @@
3802
3960
  "required": false,
3803
3961
  "types": [
3804
3962
  {
3805
- "type": "infix",
3963
+ "type": "infix_chain",
3806
3964
  "named": true
3807
3965
  }
3808
3966
  ]
@@ -3897,11 +4055,11 @@
3897
4055
  "required": true,
3898
4056
  "types": [
3899
4057
  {
3900
- "type": "binding_pattern",
4058
+ "type": "binding_pattern_operand",
3901
4059
  "named": true
3902
4060
  },
3903
4061
  {
3904
- "type": "pattern",
4062
+ "type": "pattern_operand",
3905
4063
  "named": true
3906
4064
  }
3907
4065
  ]
@@ -3917,7 +4075,7 @@
3917
4075
  "required": true,
3918
4076
  "types": [
3919
4077
  {
3920
- "type": "type",
4078
+ "type": "type_operand",
3921
4079
  "named": true
3922
4080
  }
3923
4081
  ]
@@ -3995,7 +4153,11 @@
3995
4153
  "required": true,
3996
4154
  "types": [
3997
4155
  {
3998
- "type": "expression",
4156
+ "type": "expression_operand",
4157
+ "named": true
4158
+ },
4159
+ {
4160
+ "type": "operator_chain",
3999
4161
  "named": true
4000
4162
  },
4001
4163
  {
@@ -4057,7 +4219,11 @@
4057
4219
  "required": true,
4058
4220
  "types": [
4059
4221
  {
4060
- "type": "type",
4222
+ "type": "infix_chain",
4223
+ "named": true
4224
+ },
4225
+ {
4226
+ "type": "type_operand",
4061
4227
  "named": true
4062
4228
  }
4063
4229
  ]
@@ -4073,7 +4239,11 @@
4073
4239
  "required": true,
4074
4240
  "types": [
4075
4241
  {
4076
- "type": "expression",
4242
+ "type": "expression_operand",
4243
+ "named": true
4244
+ },
4245
+ {
4246
+ "type": "operator_chain",
4077
4247
  "named": true
4078
4248
  }
4079
4249
  ]
@@ -4137,7 +4307,11 @@
4137
4307
  "required": true,
4138
4308
  "types": [
4139
4309
  {
4140
- "type": "expression",
4310
+ "type": "expression_operand",
4311
+ "named": true
4312
+ },
4313
+ {
4314
+ "type": "operator_chain",
4141
4315
  "named": true
4142
4316
  },
4143
4317
  {
@@ -4223,15 +4397,19 @@
4223
4397
  "required": false,
4224
4398
  "types": [
4225
4399
  {
4226
- "type": "binding_pattern",
4400
+ "type": "binding_pattern_operand",
4227
4401
  "named": true
4228
4402
  },
4229
4403
  {
4230
- "type": "expression",
4404
+ "type": "expression_operand",
4231
4405
  "named": true
4232
4406
  },
4233
4407
  {
4234
- "type": "pattern",
4408
+ "type": "operator_chain",
4409
+ "named": true
4410
+ },
4411
+ {
4412
+ "type": "pattern_operand",
4235
4413
  "named": true
4236
4414
  },
4237
4415
  {
@@ -4259,7 +4437,11 @@
4259
4437
  "required": true,
4260
4438
  "types": [
4261
4439
  {
4262
- "type": "expression",
4440
+ "type": "expression_operand",
4441
+ "named": true
4442
+ },
4443
+ {
4444
+ "type": "operator_chain",
4263
4445
  "named": true
4264
4446
  },
4265
4447
  {
@@ -4357,7 +4539,11 @@
4357
4539
  "required": true,
4358
4540
  "types": [
4359
4541
  {
4360
- "type": "expression",
4542
+ "type": "expression_operand",
4543
+ "named": true
4544
+ },
4545
+ {
4546
+ "type": "operator_chain",
4361
4547
  "named": true
4362
4548
  },
4363
4549
  {
@@ -4387,7 +4573,11 @@
4387
4573
  "required": true,
4388
4574
  "types": [
4389
4575
  {
4390
- "type": "type",
4576
+ "type": "infix_chain",
4577
+ "named": true
4578
+ },
4579
+ {
4580
+ "type": "type_operand",
4391
4581
  "named": true
4392
4582
  }
4393
4583
  ]
@@ -4449,29 +4639,9 @@
4449
4639
  "type": "negation",
4450
4640
  "named": true,
4451
4641
  "fields": {
4452
- "expression": {
4453
- "multiple": false,
4454
- "required": false,
4455
- "types": [
4456
- {
4457
- "type": "expression",
4458
- "named": true
4459
- }
4460
- ]
4461
- },
4462
- "minus": {
4463
- "multiple": false,
4464
- "required": false,
4465
- "types": [
4466
- {
4467
- "type": "-",
4468
- "named": false
4469
- }
4470
- ]
4471
- },
4472
4642
  "number": {
4473
4643
  "multiple": false,
4474
- "required": false,
4644
+ "required": true,
4475
4645
  "types": [
4476
4646
  {
4477
4647
  "type": "float",
@@ -4550,6 +4720,10 @@
4550
4720
  {
4551
4721
  "type": "infix",
4552
4722
  "named": true
4723
+ },
4724
+ {
4725
+ "type": "infix_chain",
4726
+ "named": true
4553
4727
  }
4554
4728
  ]
4555
4729
  },
@@ -4652,6 +4826,54 @@
4652
4826
  "named": true,
4653
4827
  "fields": {}
4654
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
+ },
4655
4877
  {
4656
4878
  "type": "parens",
4657
4879
  "named": true,
@@ -4671,7 +4893,11 @@
4671
4893
  "required": false,
4672
4894
  "types": [
4673
4895
  {
4674
- "type": "expression",
4896
+ "type": "expression_operand",
4897
+ "named": true
4898
+ },
4899
+ {
4900
+ "type": "operator_chain",
4675
4901
  "named": true
4676
4902
  },
4677
4903
  {
@@ -4685,11 +4911,15 @@
4685
4911
  "required": false,
4686
4912
  "types": [
4687
4913
  {
4688
- "type": "binding_pattern",
4914
+ "type": "binding_pattern_operand",
4915
+ "named": true
4916
+ },
4917
+ {
4918
+ "type": "infix_chain",
4689
4919
  "named": true
4690
4920
  },
4691
4921
  {
4692
- "type": "pattern",
4922
+ "type": "pattern_operand",
4693
4923
  "named": true
4694
4924
  },
4695
4925
  {
@@ -4794,7 +5024,11 @@
4794
5024
  "required": true,
4795
5025
  "types": [
4796
5026
  {
4797
- "type": "expression",
5027
+ "type": "expression_operand",
5028
+ "named": true
5029
+ },
5030
+ {
5031
+ "type": "operator_chain",
4798
5032
  "named": true
4799
5033
  },
4800
5034
  {
@@ -4808,7 +5042,11 @@
4808
5042
  "required": true,
4809
5043
  "types": [
4810
5044
  {
4811
- "type": "pattern",
5045
+ "type": "infix_chain",
5046
+ "named": true
5047
+ },
5048
+ {
5049
+ "type": "pattern_operand",
4812
5050
  "named": true
4813
5051
  },
4814
5052
  {
@@ -4851,7 +5089,7 @@
4851
5089
  "named": true
4852
5090
  },
4853
5091
  {
4854
- "type": "pattern",
5092
+ "type": "pattern_operand",
4855
5093
  "named": true
4856
5094
  },
4857
5095
  {
@@ -4869,6 +5107,10 @@
4869
5107
  "multiple": true,
4870
5108
  "required": false,
4871
5109
  "types": [
5110
+ {
5111
+ "type": "infix_chain",
5112
+ "named": true
5113
+ },
4872
5114
  {
4873
5115
  "type": "lazy_field",
4874
5116
  "named": true
@@ -4878,7 +5120,7 @@
4878
5120
  "named": true
4879
5121
  },
4880
5122
  {
4881
- "type": "type",
5123
+ "type": "type_operand",
4882
5124
  "named": true
4883
5125
  }
4884
5126
  ]
@@ -4941,6 +5183,11 @@
4941
5183
  "named": true,
4942
5184
  "fields": {}
4943
5185
  },
5186
+ {
5187
+ "type": "prefix_negation",
5188
+ "named": true,
5189
+ "fields": {}
5190
+ },
4944
5191
  {
4945
5192
  "type": "prefix_tuple",
4946
5193
  "named": true,
@@ -4965,7 +5212,7 @@
4965
5212
  "required": true,
4966
5213
  "types": [
4967
5214
  {
4968
- "type": "expression",
5215
+ "type": "expression_operand",
4969
5216
  "named": true
4970
5217
  }
4971
5218
  ]
@@ -5326,7 +5573,11 @@
5326
5573
  "required": true,
5327
5574
  "types": [
5328
5575
  {
5329
- "type": "expression",
5576
+ "type": "expression_operand",
5577
+ "named": true
5578
+ },
5579
+ {
5580
+ "type": "operator_chain",
5330
5581
  "named": true
5331
5582
  },
5332
5583
  {
@@ -5345,7 +5596,11 @@
5345
5596
  "required": true,
5346
5597
  "types": [
5347
5598
  {
5348
- "type": "pattern",
5599
+ "type": "infix_chain",
5600
+ "named": true
5601
+ },
5602
+ {
5603
+ "type": "pattern_operand",
5349
5604
  "named": true
5350
5605
  },
5351
5606
  {
@@ -5432,11 +5687,11 @@
5432
5687
  "required": false,
5433
5688
  "types": [
5434
5689
  {
5435
- "type": "binding_pattern",
5690
+ "type": "binding_pattern_operand",
5436
5691
  "named": true
5437
5692
  },
5438
5693
  {
5439
- "type": "pattern",
5694
+ "type": "pattern_operand",
5440
5695
  "named": true
5441
5696
  }
5442
5697
  ]
@@ -5446,7 +5701,7 @@
5446
5701
  "required": false,
5447
5702
  "types": [
5448
5703
  {
5449
- "type": "expression",
5704
+ "type": "expression_operand",
5450
5705
  "named": true
5451
5706
  }
5452
5707
  ]
@@ -5514,7 +5769,11 @@
5514
5769
  "required": true,
5515
5770
  "types": [
5516
5771
  {
5517
- "type": "expression",
5772
+ "type": "expression_operand",
5773
+ "named": true
5774
+ },
5775
+ {
5776
+ "type": "operator_chain",
5518
5777
  "named": true
5519
5778
  }
5520
5779
  ]
@@ -5600,7 +5859,11 @@
5600
5859
  "required": false,
5601
5860
  "types": [
5602
5861
  {
5603
- "type": "expression",
5862
+ "type": "expression_operand",
5863
+ "named": true
5864
+ },
5865
+ {
5866
+ "type": "operator_chain",
5604
5867
  "named": true
5605
5868
  }
5606
5869
  ]
@@ -5648,11 +5911,15 @@
5648
5911
  "required": false,
5649
5912
  "types": [
5650
5913
  {
5651
- "type": "binding_pattern",
5914
+ "type": "binding_pattern_operand",
5915
+ "named": true
5916
+ },
5917
+ {
5918
+ "type": "infix_chain",
5652
5919
  "named": true
5653
5920
  },
5654
5921
  {
5655
- "type": "pattern",
5922
+ "type": "pattern_operand",
5656
5923
  "named": true
5657
5924
  }
5658
5925
  ]
@@ -5784,11 +6051,11 @@
5784
6051
  "required": true,
5785
6052
  "types": [
5786
6053
  {
5787
- "type": "binding_pattern",
6054
+ "type": "binding_pattern_operand",
5788
6055
  "named": true
5789
6056
  },
5790
6057
  {
5791
- "type": "pattern",
6058
+ "type": "pattern_operand",
5792
6059
  "named": true
5793
6060
  }
5794
6061
  ]
@@ -5804,7 +6071,11 @@
5804
6071
  "required": true,
5805
6072
  "types": [
5806
6073
  {
5807
- "type": "type",
6074
+ "type": "infix_chain",
6075
+ "named": true
6076
+ },
6077
+ {
6078
+ "type": "type_operand",
5808
6079
  "named": true
5809
6080
  }
5810
6081
  ]
@@ -5846,7 +6117,11 @@
5846
6117
  "required": false,
5847
6118
  "types": [
5848
6119
  {
5849
- "type": "type",
6120
+ "type": "infix_chain",
6121
+ "named": true
6122
+ },
6123
+ {
6124
+ "type": "type_operand",
5850
6125
  "named": true
5851
6126
  }
5852
6127
  ]
@@ -5862,7 +6137,11 @@
5862
6137
  "required": true,
5863
6138
  "types": [
5864
6139
  {
5865
- "type": "expression",
6140
+ "type": "expression_operand",
6141
+ "named": true
6142
+ },
6143
+ {
6144
+ "type": "operator_chain",
5866
6145
  "named": true
5867
6146
  }
5868
6147
  ]
@@ -5877,7 +6156,11 @@
5877
6156
  "required": false,
5878
6157
  "types": [
5879
6158
  {
5880
- "type": "expression",
6159
+ "type": "expression_operand",
6160
+ "named": true
6161
+ },
6162
+ {
6163
+ "type": "operator_chain",
5881
6164
  "named": true
5882
6165
  },
5883
6166
  {
@@ -5891,7 +6174,11 @@
5891
6174
  "required": true,
5892
6175
  "types": [
5893
6176
  {
5894
- "type": "expression",
6177
+ "type": "expression_operand",
6178
+ "named": true
6179
+ },
6180
+ {
6181
+ "type": "operator_chain",
5895
6182
  "named": true
5896
6183
  },
5897
6184
  {
@@ -5911,15 +6198,19 @@
5911
6198
  "required": false,
5912
6199
  "types": [
5913
6200
  {
5914
- "type": "binding_pattern",
6201
+ "type": "binding_pattern_operand",
6202
+ "named": true
6203
+ },
6204
+ {
6205
+ "type": "expression_operand",
5915
6206
  "named": true
5916
6207
  },
5917
6208
  {
5918
- "type": "expression",
6209
+ "type": "operator_chain",
5919
6210
  "named": true
5920
6211
  },
5921
6212
  {
5922
- "type": "pattern",
6213
+ "type": "pattern_operand",
5923
6214
  "named": true
5924
6215
  },
5925
6216
  {
@@ -5957,7 +6248,7 @@
5957
6248
  "required": true,
5958
6249
  "types": [
5959
6250
  {
5960
- "type": "type",
6251
+ "type": "type_operand",
5961
6252
  "named": true
5962
6253
  }
5963
6254
  ]
@@ -5973,7 +6264,7 @@
5973
6264
  "required": true,
5974
6265
  "types": [
5975
6266
  {
5976
- "type": "type",
6267
+ "type": "type_operand",
5977
6268
  "named": true
5978
6269
  }
5979
6270
  ]
@@ -6135,7 +6426,7 @@
6135
6426
  "required": false,
6136
6427
  "types": [
6137
6428
  {
6138
- "type": "infix",
6429
+ "type": "infix_chain",
6139
6430
  "named": true
6140
6431
  }
6141
6432
  ]
@@ -6241,7 +6532,7 @@
6241
6532
  "named": true
6242
6533
  },
6243
6534
  {
6244
- "type": "type",
6535
+ "type": "type_operand",
6245
6536
  "named": true
6246
6537
  }
6247
6538
  ]
@@ -6342,15 +6633,19 @@
6342
6633
  "required": true,
6343
6634
  "types": [
6344
6635
  {
6345
- "type": "binding_pattern",
6636
+ "type": "binding_pattern_operand",
6637
+ "named": true
6638
+ },
6639
+ {
6640
+ "type": "expression_operand",
6346
6641
  "named": true
6347
6642
  },
6348
6643
  {
6349
- "type": "expression",
6644
+ "type": "operator_chain",
6350
6645
  "named": true
6351
6646
  },
6352
6647
  {
6353
- "type": "pattern",
6648
+ "type": "pattern_operand",
6354
6649
  "named": true
6355
6650
  },
6356
6651
  {
@@ -6378,15 +6673,19 @@
6378
6673
  "required": true,
6379
6674
  "types": [
6380
6675
  {
6381
- "type": "binding_pattern",
6676
+ "type": "binding_pattern_operand",
6677
+ "named": true
6678
+ },
6679
+ {
6680
+ "type": "expression_operand",
6382
6681
  "named": true
6383
6682
  },
6384
6683
  {
6385
- "type": "expression",
6684
+ "type": "operator_chain",
6386
6685
  "named": true
6387
6686
  },
6388
6687
  {
6389
- "type": "pattern",
6688
+ "type": "pattern_operand",
6390
6689
  "named": true
6391
6690
  },
6392
6691
  {
@@ -6440,7 +6739,11 @@
6440
6739
  "required": true,
6441
6740
  "types": [
6442
6741
  {
6443
- "type": "expression",
6742
+ "type": "expression_operand",
6743
+ "named": true
6744
+ },
6745
+ {
6746
+ "type": "operator_chain",
6444
6747
  "named": true
6445
6748
  },
6446
6749
  {
@@ -6454,11 +6757,15 @@
6454
6757
  "required": true,
6455
6758
  "types": [
6456
6759
  {
6457
- "type": "binding_pattern",
6760
+ "type": "binding_pattern_operand",
6761
+ "named": true
6762
+ },
6763
+ {
6764
+ "type": "infix_chain",
6458
6765
  "named": true
6459
6766
  },
6460
6767
  {
6461
- "type": "pattern",
6768
+ "type": "pattern_operand",
6462
6769
  "named": true
6463
6770
  },
6464
6771
  {
@@ -6534,6 +6841,10 @@
6534
6841
  "type": "-",
6535
6842
  "named": false
6536
6843
  },
6844
+ {
6845
+ "type": "--",
6846
+ "named": false
6847
+ },
6537
6848
  {
6538
6849
  "type": "->",
6539
6850
  "named": false
@@ -6542,6 +6853,10 @@
6542
6853
  "type": "->.",
6543
6854
  "named": false
6544
6855
  },
6856
+ {
6857
+ "type": "-}",
6858
+ "named": false
6859
+ },
6545
6860
  {
6546
6861
  "type": ".",
6547
6862
  "named": false
@@ -6635,12 +6950,11 @@
6635
6950
  "named": false
6636
6951
  },
6637
6952
  {
6638
- "type": "comment",
6639
- "named": true,
6640
- "extra": true
6953
+ "type": "constructor",
6954
+ "named": true
6641
6955
  },
6642
6956
  {
6643
- "type": "constructor",
6957
+ "type": "content",
6644
6958
  "named": true
6645
6959
  },
6646
6960
  {
@@ -6701,9 +7015,8 @@
6701
7015
  "named": false
6702
7016
  },
6703
7017
  {
6704
- "type": "haddock",
6705
- "named": true,
6706
- "extra": true
7018
+ "type": "haddock_marker",
7019
+ "named": false
6707
7020
  },
6708
7021
  {
6709
7022
  "type": "hiding",
@@ -6870,6 +7183,10 @@
6870
7183
  "type": "{",
6871
7184
  "named": false
6872
7185
  },
7186
+ {
7187
+ "type": "{-",
7188
+ "named": false
7189
+ },
6873
7190
  {
6874
7191
  "type": "|",
6875
7192
  "named": false