@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/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
  {
@@ -1482,6 +1498,22 @@
1482
1498
  }
1483
1499
  }
1484
1500
  },
1501
+ {
1502
+ "type": "comment",
1503
+ "named": true,
1504
+ "extra": true,
1505
+ "fields": {},
1506
+ "children": {
1507
+ "multiple": false,
1508
+ "required": true,
1509
+ "types": [
1510
+ {
1511
+ "type": "content",
1512
+ "named": true
1513
+ }
1514
+ ]
1515
+ }
1516
+ },
1485
1517
  {
1486
1518
  "type": "conditional",
1487
1519
  "named": true,
@@ -1491,7 +1523,11 @@
1491
1523
  "required": true,
1492
1524
  "types": [
1493
1525
  {
1494
- "type": "expression",
1526
+ "type": "expression_operand",
1527
+ "named": true
1528
+ },
1529
+ {
1530
+ "type": "operator_chain",
1495
1531
  "named": true
1496
1532
  },
1497
1533
  {
@@ -1505,7 +1541,11 @@
1505
1541
  "required": true,
1506
1542
  "types": [
1507
1543
  {
1508
- "type": "expression",
1544
+ "type": "expression_operand",
1545
+ "named": true
1546
+ },
1547
+ {
1548
+ "type": "operator_chain",
1509
1549
  "named": true
1510
1550
  },
1511
1551
  {
@@ -1519,7 +1559,11 @@
1519
1559
  "required": true,
1520
1560
  "types": [
1521
1561
  {
1522
- "type": "expression",
1562
+ "type": "expression_operand",
1563
+ "named": true
1564
+ },
1565
+ {
1566
+ "type": "operator_chain",
1523
1567
  "named": true
1524
1568
  },
1525
1569
  {
@@ -1592,7 +1636,11 @@
1592
1636
  "required": false,
1593
1637
  "types": [
1594
1638
  {
1595
- "type": "pattern",
1639
+ "type": "infix_chain",
1640
+ "named": true
1641
+ },
1642
+ {
1643
+ "type": "pattern_operand",
1596
1644
  "named": true
1597
1645
  },
1598
1646
  {
@@ -1651,7 +1699,11 @@
1651
1699
  "required": true,
1652
1700
  "types": [
1653
1701
  {
1654
- "type": "constraint",
1702
+ "type": "constraint_operand",
1703
+ "named": true
1704
+ },
1705
+ {
1706
+ "type": "infix_chain",
1655
1707
  "named": true
1656
1708
  }
1657
1709
  ]
@@ -1872,6 +1924,10 @@
1872
1924
  {
1873
1925
  "type": "infix",
1874
1926
  "named": true
1927
+ },
1928
+ {
1929
+ "type": "infix_chain",
1930
+ "named": true
1875
1931
  }
1876
1932
  ]
1877
1933
  },
@@ -1991,7 +2047,11 @@
1991
2047
  "required": true,
1992
2048
  "types": [
1993
2049
  {
1994
- "type": "constraint",
2050
+ "type": "constraint_operand",
2051
+ "named": true
2052
+ },
2053
+ {
2054
+ "type": "infix_chain",
1995
2055
  "named": true
1996
2056
  }
1997
2057
  ]
@@ -2051,7 +2111,7 @@
2051
2111
  "required": false,
2052
2112
  "types": [
2053
2113
  {
2054
- "type": "infix",
2114
+ "type": "infix_chain",
2055
2115
  "named": true
2056
2116
  }
2057
2117
  ]
@@ -2230,7 +2290,7 @@
2230
2290
  "required": false,
2231
2291
  "types": [
2232
2292
  {
2233
- "type": "infix",
2293
+ "type": "infix_chain",
2234
2294
  "named": true
2235
2295
  }
2236
2296
  ]
@@ -2268,7 +2328,11 @@
2268
2328
  "required": false,
2269
2329
  "types": [
2270
2330
  {
2271
- "type": "pattern",
2331
+ "type": "infix_chain",
2332
+ "named": true
2333
+ },
2334
+ {
2335
+ "type": "pattern_operand",
2272
2336
  "named": true
2273
2337
  },
2274
2338
  {
@@ -2292,7 +2356,11 @@
2292
2356
  "required": false,
2293
2357
  "types": [
2294
2358
  {
2295
- "type": "pattern",
2359
+ "type": "infix_chain",
2360
+ "named": true
2361
+ },
2362
+ {
2363
+ "type": "pattern_operand",
2296
2364
  "named": true
2297
2365
  }
2298
2366
  ]
@@ -2334,7 +2402,11 @@
2334
2402
  "required": true,
2335
2403
  "types": [
2336
2404
  {
2337
- "type": "expression",
2405
+ "type": "expression_operand",
2406
+ "named": true
2407
+ },
2408
+ {
2409
+ "type": "operator_chain",
2338
2410
  "named": true
2339
2411
  },
2340
2412
  {
@@ -2353,7 +2425,11 @@
2353
2425
  "required": true,
2354
2426
  "types": [
2355
2427
  {
2356
- "type": "type",
2428
+ "type": "infix_chain",
2429
+ "named": true
2430
+ },
2431
+ {
2432
+ "type": "type_operand",
2357
2433
  "named": true
2358
2434
  }
2359
2435
  ]
@@ -2506,7 +2582,11 @@
2506
2582
  "required": false,
2507
2583
  "types": [
2508
2584
  {
2509
- "type": "type",
2585
+ "type": "infix_chain",
2586
+ "named": true
2587
+ },
2588
+ {
2589
+ "type": "type_operand",
2510
2590
  "named": true
2511
2591
  }
2512
2592
  ]
@@ -2580,11 +2660,15 @@
2580
2660
  "required": false,
2581
2661
  "types": [
2582
2662
  {
2583
- "type": "binding_pattern",
2663
+ "type": "binding_pattern_operand",
2664
+ "named": true
2665
+ },
2666
+ {
2667
+ "type": "infix_chain",
2584
2668
  "named": true
2585
2669
  },
2586
2670
  {
2587
- "type": "pattern",
2671
+ "type": "pattern_operand",
2588
2672
  "named": true
2589
2673
  },
2590
2674
  {
@@ -2618,7 +2702,11 @@
2618
2702
  "required": false,
2619
2703
  "types": [
2620
2704
  {
2621
- "type": "expression",
2705
+ "type": "expression_operand",
2706
+ "named": true
2707
+ },
2708
+ {
2709
+ "type": "operator_chain",
2622
2710
  "named": true
2623
2711
  },
2624
2712
  {
@@ -3152,7 +3240,11 @@
3152
3240
  "required": true,
3153
3241
  "types": [
3154
3242
  {
3155
- "type": "expression",
3243
+ "type": "expression_operand",
3244
+ "named": true
3245
+ },
3246
+ {
3247
+ "type": "operator_chain",
3156
3248
  "named": true
3157
3249
  },
3158
3250
  {
@@ -3166,7 +3258,11 @@
3166
3258
  "required": true,
3167
3259
  "types": [
3168
3260
  {
3169
- "type": "pattern",
3261
+ "type": "infix_chain",
3262
+ "named": true
3263
+ },
3264
+ {
3265
+ "type": "pattern_operand",
3170
3266
  "named": true
3171
3267
  },
3172
3268
  {
@@ -3186,7 +3282,11 @@
3186
3282
  "required": true,
3187
3283
  "types": [
3188
3284
  {
3189
- "type": "expression",
3285
+ "type": "expression_operand",
3286
+ "named": true
3287
+ },
3288
+ {
3289
+ "type": "operator_chain",
3190
3290
  "named": true
3191
3291
  },
3192
3292
  {
@@ -3200,7 +3300,11 @@
3200
3300
  "required": false,
3201
3301
  "types": [
3202
3302
  {
3203
- "type": "expression",
3303
+ "type": "expression_operand",
3304
+ "named": true
3305
+ },
3306
+ {
3307
+ "type": "operator_chain",
3204
3308
  "named": true
3205
3309
  },
3206
3310
  {
@@ -3227,6 +3331,22 @@
3227
3331
  }
3228
3332
  }
3229
3333
  },
3334
+ {
3335
+ "type": "haddock",
3336
+ "named": true,
3337
+ "extra": true,
3338
+ "fields": {},
3339
+ "children": {
3340
+ "multiple": false,
3341
+ "required": true,
3342
+ "types": [
3343
+ {
3344
+ "type": "content",
3345
+ "named": true
3346
+ }
3347
+ ]
3348
+ }
3349
+ },
3230
3350
  {
3231
3351
  "type": "haskell",
3232
3352
  "named": true,
@@ -3515,11 +3635,7 @@
3515
3635
  "required": true,
3516
3636
  "types": [
3517
3637
  {
3518
- "type": "binding_pattern",
3519
- "named": true
3520
- },
3521
- {
3522
- "type": "expression",
3638
+ "type": "infix_chain",
3523
3639
  "named": true
3524
3640
  },
3525
3641
  {
@@ -3527,7 +3643,7 @@
3527
3643
  "named": true
3528
3644
  },
3529
3645
  {
3530
- "type": "pattern",
3646
+ "type": "pattern_operand",
3531
3647
  "named": true
3532
3648
  },
3533
3649
  {
@@ -3535,7 +3651,7 @@
3535
3651
  "named": true
3536
3652
  },
3537
3653
  {
3538
- "type": "type",
3654
+ "type": "type_operand",
3539
3655
  "named": true
3540
3656
  },
3541
3657
  {
@@ -3560,10 +3676,6 @@
3560
3676
  "type": "operator",
3561
3677
  "named": true
3562
3678
  },
3563
- {
3564
- "type": "promoted",
3565
- "named": true
3566
- },
3567
3679
  {
3568
3680
  "type": "qualified",
3569
3681
  "named": true
@@ -3575,11 +3687,7 @@
3575
3687
  "required": true,
3576
3688
  "types": [
3577
3689
  {
3578
- "type": "binding_pattern",
3579
- "named": true
3580
- },
3581
- {
3582
- "type": "expression",
3690
+ "type": "infix_chain",
3583
3691
  "named": true
3584
3692
  },
3585
3693
  {
@@ -3587,7 +3695,7 @@
3587
3695
  "named": true
3588
3696
  },
3589
3697
  {
3590
- "type": "pattern",
3698
+ "type": "pattern_operand",
3591
3699
  "named": true
3592
3700
  },
3593
3701
  {
@@ -3595,7 +3703,7 @@
3595
3703
  "named": true
3596
3704
  },
3597
3705
  {
3598
- "type": "type",
3706
+ "type": "type_operand",
3599
3707
  "named": true
3600
3708
  },
3601
3709
  {
@@ -3606,6 +3714,56 @@
3606
3714
  }
3607
3715
  }
3608
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
+ },
3609
3767
  {
3610
3768
  "type": "infix_id",
3611
3769
  "named": true,
@@ -3676,7 +3834,7 @@
3676
3834
  "required": false,
3677
3835
  "types": [
3678
3836
  {
3679
- "type": "infix",
3837
+ "type": "infix_chain",
3680
3838
  "named": true
3681
3839
  }
3682
3840
  ]
@@ -3767,11 +3925,11 @@
3767
3925
  "required": true,
3768
3926
  "types": [
3769
3927
  {
3770
- "type": "binding_pattern",
3928
+ "type": "binding_pattern_operand",
3771
3929
  "named": true
3772
3930
  },
3773
3931
  {
3774
- "type": "pattern",
3932
+ "type": "pattern_operand",
3775
3933
  "named": true
3776
3934
  }
3777
3935
  ]
@@ -3787,7 +3945,7 @@
3787
3945
  "required": true,
3788
3946
  "types": [
3789
3947
  {
3790
- "type": "type",
3948
+ "type": "type_operand",
3791
3949
  "named": true
3792
3950
  }
3793
3951
  ]
@@ -3861,7 +4019,11 @@
3861
4019
  "required": true,
3862
4020
  "types": [
3863
4021
  {
3864
- "type": "expression",
4022
+ "type": "expression_operand",
4023
+ "named": true
4024
+ },
4025
+ {
4026
+ "type": "operator_chain",
3865
4027
  "named": true
3866
4028
  },
3867
4029
  {
@@ -3923,7 +4085,11 @@
3923
4085
  "required": true,
3924
4086
  "types": [
3925
4087
  {
3926
- "type": "type",
4088
+ "type": "infix_chain",
4089
+ "named": true
4090
+ },
4091
+ {
4092
+ "type": "type_operand",
3927
4093
  "named": true
3928
4094
  }
3929
4095
  ]
@@ -3939,7 +4105,11 @@
3939
4105
  "required": true,
3940
4106
  "types": [
3941
4107
  {
3942
- "type": "expression",
4108
+ "type": "expression_operand",
4109
+ "named": true
4110
+ },
4111
+ {
4112
+ "type": "operator_chain",
3943
4113
  "named": true
3944
4114
  }
3945
4115
  ]
@@ -4003,7 +4173,11 @@
4003
4173
  "required": true,
4004
4174
  "types": [
4005
4175
  {
4006
- "type": "expression",
4176
+ "type": "expression_operand",
4177
+ "named": true
4178
+ },
4179
+ {
4180
+ "type": "operator_chain",
4007
4181
  "named": true
4008
4182
  },
4009
4183
  {
@@ -4089,15 +4263,19 @@
4089
4263
  "required": false,
4090
4264
  "types": [
4091
4265
  {
4092
- "type": "binding_pattern",
4266
+ "type": "binding_pattern_operand",
4093
4267
  "named": true
4094
4268
  },
4095
4269
  {
4096
- "type": "expression",
4270
+ "type": "expression_operand",
4097
4271
  "named": true
4098
4272
  },
4099
4273
  {
4100
- "type": "pattern",
4274
+ "type": "operator_chain",
4275
+ "named": true
4276
+ },
4277
+ {
4278
+ "type": "pattern_operand",
4101
4279
  "named": true
4102
4280
  },
4103
4281
  {
@@ -4125,7 +4303,11 @@
4125
4303
  "required": true,
4126
4304
  "types": [
4127
4305
  {
4128
- "type": "expression",
4306
+ "type": "expression_operand",
4307
+ "named": true
4308
+ },
4309
+ {
4310
+ "type": "operator_chain",
4129
4311
  "named": true
4130
4312
  },
4131
4313
  {
@@ -4202,7 +4384,11 @@
4202
4384
  "required": true,
4203
4385
  "types": [
4204
4386
  {
4205
- "type": "expression",
4387
+ "type": "expression_operand",
4388
+ "named": true
4389
+ },
4390
+ {
4391
+ "type": "operator_chain",
4206
4392
  "named": true
4207
4393
  },
4208
4394
  {
@@ -4232,7 +4418,11 @@
4232
4418
  "required": true,
4233
4419
  "types": [
4234
4420
  {
4235
- "type": "type",
4421
+ "type": "infix_chain",
4422
+ "named": true
4423
+ },
4424
+ {
4425
+ "type": "type_operand",
4236
4426
  "named": true
4237
4427
  }
4238
4428
  ]
@@ -4294,29 +4484,9 @@
4294
4484
  "type": "negation",
4295
4485
  "named": true,
4296
4486
  "fields": {
4297
- "expression": {
4298
- "multiple": false,
4299
- "required": false,
4300
- "types": [
4301
- {
4302
- "type": "expression",
4303
- "named": true
4304
- }
4305
- ]
4306
- },
4307
- "minus": {
4308
- "multiple": false,
4309
- "required": false,
4310
- "types": [
4311
- {
4312
- "type": "-",
4313
- "named": false
4314
- }
4315
- ]
4316
- },
4317
4487
  "number": {
4318
4488
  "multiple": false,
4319
- "required": false,
4489
+ "required": true,
4320
4490
  "types": [
4321
4491
  {
4322
4492
  "type": "float",
@@ -4395,6 +4565,10 @@
4395
4565
  {
4396
4566
  "type": "infix",
4397
4567
  "named": true
4568
+ },
4569
+ {
4570
+ "type": "infix_chain",
4571
+ "named": true
4398
4572
  }
4399
4573
  ]
4400
4574
  },
@@ -4489,6 +4663,54 @@
4489
4663
  "named": true,
4490
4664
  "fields": {}
4491
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
+ },
4492
4714
  {
4493
4715
  "type": "parens",
4494
4716
  "named": true,
@@ -4508,7 +4730,11 @@
4508
4730
  "required": false,
4509
4731
  "types": [
4510
4732
  {
4511
- "type": "expression",
4733
+ "type": "expression_operand",
4734
+ "named": true
4735
+ },
4736
+ {
4737
+ "type": "operator_chain",
4512
4738
  "named": true
4513
4739
  },
4514
4740
  {
@@ -4522,11 +4748,15 @@
4522
4748
  "required": false,
4523
4749
  "types": [
4524
4750
  {
4525
- "type": "binding_pattern",
4751
+ "type": "binding_pattern_operand",
4752
+ "named": true
4753
+ },
4754
+ {
4755
+ "type": "infix_chain",
4526
4756
  "named": true
4527
4757
  },
4528
4758
  {
4529
- "type": "pattern",
4759
+ "type": "pattern_operand",
4530
4760
  "named": true
4531
4761
  },
4532
4762
  {
@@ -4627,7 +4857,11 @@
4627
4857
  "required": true,
4628
4858
  "types": [
4629
4859
  {
4630
- "type": "expression",
4860
+ "type": "expression_operand",
4861
+ "named": true
4862
+ },
4863
+ {
4864
+ "type": "operator_chain",
4631
4865
  "named": true
4632
4866
  },
4633
4867
  {
@@ -4641,7 +4875,11 @@
4641
4875
  "required": true,
4642
4876
  "types": [
4643
4877
  {
4644
- "type": "pattern",
4878
+ "type": "infix_chain",
4879
+ "named": true
4880
+ },
4881
+ {
4882
+ "type": "pattern_operand",
4645
4883
  "named": true
4646
4884
  },
4647
4885
  {
@@ -4684,7 +4922,7 @@
4684
4922
  "named": true
4685
4923
  },
4686
4924
  {
4687
- "type": "pattern",
4925
+ "type": "pattern_operand",
4688
4926
  "named": true
4689
4927
  },
4690
4928
  {
@@ -4702,6 +4940,10 @@
4702
4940
  "multiple": true,
4703
4941
  "required": false,
4704
4942
  "types": [
4943
+ {
4944
+ "type": "infix_chain",
4945
+ "named": true
4946
+ },
4705
4947
  {
4706
4948
  "type": "lazy_field",
4707
4949
  "named": true
@@ -4711,7 +4953,7 @@
4711
4953
  "named": true
4712
4954
  },
4713
4955
  {
4714
- "type": "type",
4956
+ "type": "type_operand",
4715
4957
  "named": true
4716
4958
  }
4717
4959
  ]
@@ -4770,6 +5012,11 @@
4770
5012
  "named": true,
4771
5013
  "fields": {}
4772
5014
  },
5015
+ {
5016
+ "type": "prefix_negation",
5017
+ "named": true,
5018
+ "fields": {}
5019
+ },
4773
5020
  {
4774
5021
  "type": "prefix_tuple",
4775
5022
  "named": true,
@@ -4794,7 +5041,7 @@
4794
5041
  "required": true,
4795
5042
  "types": [
4796
5043
  {
4797
- "type": "expression",
5044
+ "type": "expression_operand",
4798
5045
  "named": true
4799
5046
  }
4800
5047
  ]
@@ -5155,7 +5402,11 @@
5155
5402
  "required": true,
5156
5403
  "types": [
5157
5404
  {
5158
- "type": "expression",
5405
+ "type": "expression_operand",
5406
+ "named": true
5407
+ },
5408
+ {
5409
+ "type": "operator_chain",
5159
5410
  "named": true
5160
5411
  },
5161
5412
  {
@@ -5174,7 +5425,11 @@
5174
5425
  "required": true,
5175
5426
  "types": [
5176
5427
  {
5177
- "type": "pattern",
5428
+ "type": "infix_chain",
5429
+ "named": true
5430
+ },
5431
+ {
5432
+ "type": "pattern_operand",
5178
5433
  "named": true
5179
5434
  },
5180
5435
  {
@@ -5261,11 +5516,11 @@
5261
5516
  "required": false,
5262
5517
  "types": [
5263
5518
  {
5264
- "type": "binding_pattern",
5519
+ "type": "binding_pattern_operand",
5265
5520
  "named": true
5266
5521
  },
5267
5522
  {
5268
- "type": "pattern",
5523
+ "type": "pattern_operand",
5269
5524
  "named": true
5270
5525
  }
5271
5526
  ]
@@ -5275,7 +5530,7 @@
5275
5530
  "required": false,
5276
5531
  "types": [
5277
5532
  {
5278
- "type": "expression",
5533
+ "type": "expression_operand",
5279
5534
  "named": true
5280
5535
  }
5281
5536
  ]
@@ -5339,7 +5594,11 @@
5339
5594
  "required": true,
5340
5595
  "types": [
5341
5596
  {
5342
- "type": "expression",
5597
+ "type": "expression_operand",
5598
+ "named": true
5599
+ },
5600
+ {
5601
+ "type": "operator_chain",
5343
5602
  "named": true
5344
5603
  }
5345
5604
  ]
@@ -5421,7 +5680,11 @@
5421
5680
  "required": false,
5422
5681
  "types": [
5423
5682
  {
5424
- "type": "expression",
5683
+ "type": "expression_operand",
5684
+ "named": true
5685
+ },
5686
+ {
5687
+ "type": "operator_chain",
5425
5688
  "named": true
5426
5689
  }
5427
5690
  ]
@@ -5465,11 +5728,15 @@
5465
5728
  "required": false,
5466
5729
  "types": [
5467
5730
  {
5468
- "type": "binding_pattern",
5731
+ "type": "binding_pattern_operand",
5732
+ "named": true
5733
+ },
5734
+ {
5735
+ "type": "infix_chain",
5469
5736
  "named": true
5470
5737
  },
5471
5738
  {
5472
- "type": "pattern",
5739
+ "type": "pattern_operand",
5473
5740
  "named": true
5474
5741
  }
5475
5742
  ]
@@ -5597,11 +5864,11 @@
5597
5864
  "required": true,
5598
5865
  "types": [
5599
5866
  {
5600
- "type": "binding_pattern",
5867
+ "type": "binding_pattern_operand",
5601
5868
  "named": true
5602
5869
  },
5603
5870
  {
5604
- "type": "pattern",
5871
+ "type": "pattern_operand",
5605
5872
  "named": true
5606
5873
  }
5607
5874
  ]
@@ -5617,7 +5884,11 @@
5617
5884
  "required": true,
5618
5885
  "types": [
5619
5886
  {
5620
- "type": "type",
5887
+ "type": "infix_chain",
5888
+ "named": true
5889
+ },
5890
+ {
5891
+ "type": "type_operand",
5621
5892
  "named": true
5622
5893
  }
5623
5894
  ]
@@ -5655,7 +5926,11 @@
5655
5926
  "required": false,
5656
5927
  "types": [
5657
5928
  {
5658
- "type": "type",
5929
+ "type": "infix_chain",
5930
+ "named": true
5931
+ },
5932
+ {
5933
+ "type": "type_operand",
5659
5934
  "named": true
5660
5935
  }
5661
5936
  ]
@@ -5671,7 +5946,11 @@
5671
5946
  "required": true,
5672
5947
  "types": [
5673
5948
  {
5674
- "type": "expression",
5949
+ "type": "expression_operand",
5950
+ "named": true
5951
+ },
5952
+ {
5953
+ "type": "operator_chain",
5675
5954
  "named": true
5676
5955
  }
5677
5956
  ]
@@ -5686,7 +5965,11 @@
5686
5965
  "required": false,
5687
5966
  "types": [
5688
5967
  {
5689
- "type": "expression",
5968
+ "type": "expression_operand",
5969
+ "named": true
5970
+ },
5971
+ {
5972
+ "type": "operator_chain",
5690
5973
  "named": true
5691
5974
  },
5692
5975
  {
@@ -5700,7 +5983,11 @@
5700
5983
  "required": true,
5701
5984
  "types": [
5702
5985
  {
5703
- "type": "expression",
5986
+ "type": "expression_operand",
5987
+ "named": true
5988
+ },
5989
+ {
5990
+ "type": "operator_chain",
5704
5991
  "named": true
5705
5992
  },
5706
5993
  {
@@ -5720,15 +6007,19 @@
5720
6007
  "required": false,
5721
6008
  "types": [
5722
6009
  {
5723
- "type": "binding_pattern",
6010
+ "type": "binding_pattern_operand",
6011
+ "named": true
6012
+ },
6013
+ {
6014
+ "type": "expression_operand",
5724
6015
  "named": true
5725
6016
  },
5726
6017
  {
5727
- "type": "expression",
6018
+ "type": "operator_chain",
5728
6019
  "named": true
5729
6020
  },
5730
6021
  {
5731
- "type": "pattern",
6022
+ "type": "pattern_operand",
5732
6023
  "named": true
5733
6024
  },
5734
6025
  {
@@ -5766,7 +6057,7 @@
5766
6057
  "required": true,
5767
6058
  "types": [
5768
6059
  {
5769
- "type": "type",
6060
+ "type": "type_operand",
5770
6061
  "named": true
5771
6062
  }
5772
6063
  ]
@@ -5782,7 +6073,7 @@
5782
6073
  "required": true,
5783
6074
  "types": [
5784
6075
  {
5785
- "type": "type",
6076
+ "type": "type_operand",
5786
6077
  "named": true
5787
6078
  }
5788
6079
  ]
@@ -5940,7 +6231,7 @@
5940
6231
  "required": false,
5941
6232
  "types": [
5942
6233
  {
5943
- "type": "infix",
6234
+ "type": "infix_chain",
5944
6235
  "named": true
5945
6236
  }
5946
6237
  ]
@@ -6042,7 +6333,7 @@
6042
6333
  "named": true
6043
6334
  },
6044
6335
  {
6045
- "type": "type",
6336
+ "type": "type_operand",
6046
6337
  "named": true
6047
6338
  }
6048
6339
  ]
@@ -6139,15 +6430,19 @@
6139
6430
  "required": true,
6140
6431
  "types": [
6141
6432
  {
6142
- "type": "binding_pattern",
6433
+ "type": "binding_pattern_operand",
6434
+ "named": true
6435
+ },
6436
+ {
6437
+ "type": "expression_operand",
6143
6438
  "named": true
6144
6439
  },
6145
6440
  {
6146
- "type": "expression",
6441
+ "type": "operator_chain",
6147
6442
  "named": true
6148
6443
  },
6149
6444
  {
6150
- "type": "pattern",
6445
+ "type": "pattern_operand",
6151
6446
  "named": true
6152
6447
  },
6153
6448
  {
@@ -6175,15 +6470,19 @@
6175
6470
  "required": true,
6176
6471
  "types": [
6177
6472
  {
6178
- "type": "binding_pattern",
6473
+ "type": "binding_pattern_operand",
6474
+ "named": true
6475
+ },
6476
+ {
6477
+ "type": "expression_operand",
6179
6478
  "named": true
6180
6479
  },
6181
6480
  {
6182
- "type": "expression",
6481
+ "type": "operator_chain",
6183
6482
  "named": true
6184
6483
  },
6185
6484
  {
6186
- "type": "pattern",
6485
+ "type": "pattern_operand",
6187
6486
  "named": true
6188
6487
  },
6189
6488
  {
@@ -6237,7 +6536,11 @@
6237
6536
  "required": true,
6238
6537
  "types": [
6239
6538
  {
6240
- "type": "expression",
6539
+ "type": "expression_operand",
6540
+ "named": true
6541
+ },
6542
+ {
6543
+ "type": "operator_chain",
6241
6544
  "named": true
6242
6545
  },
6243
6546
  {
@@ -6251,11 +6554,15 @@
6251
6554
  "required": true,
6252
6555
  "types": [
6253
6556
  {
6254
- "type": "binding_pattern",
6557
+ "type": "binding_pattern_operand",
6558
+ "named": true
6559
+ },
6560
+ {
6561
+ "type": "infix_chain",
6255
6562
  "named": true
6256
6563
  },
6257
6564
  {
6258
- "type": "pattern",
6565
+ "type": "pattern_operand",
6259
6566
  "named": true
6260
6567
  },
6261
6568
  {
@@ -6327,6 +6634,10 @@
6327
6634
  "type": "-",
6328
6635
  "named": false
6329
6636
  },
6637
+ {
6638
+ "type": "--",
6639
+ "named": false
6640
+ },
6330
6641
  {
6331
6642
  "type": "->",
6332
6643
  "named": false
@@ -6335,6 +6646,10 @@
6335
6646
  "type": "->.",
6336
6647
  "named": false
6337
6648
  },
6649
+ {
6650
+ "type": "-}",
6651
+ "named": false
6652
+ },
6338
6653
  {
6339
6654
  "type": ".",
6340
6655
  "named": false
@@ -6428,12 +6743,11 @@
6428
6743
  "named": false
6429
6744
  },
6430
6745
  {
6431
- "type": "comment",
6432
- "named": true,
6433
- "extra": true
6746
+ "type": "constructor",
6747
+ "named": true
6434
6748
  },
6435
6749
  {
6436
- "type": "constructor",
6750
+ "type": "content",
6437
6751
  "named": true
6438
6752
  },
6439
6753
  {
@@ -6494,9 +6808,8 @@
6494
6808
  "named": false
6495
6809
  },
6496
6810
  {
6497
- "type": "haddock",
6498
- "named": true,
6499
- "extra": true
6811
+ "type": "haddock_marker",
6812
+ "named": false
6500
6813
  },
6501
6814
  {
6502
6815
  "type": "hiding",
@@ -6655,6 +6968,10 @@
6655
6968
  "type": "{",
6656
6969
  "named": false
6657
6970
  },
6971
+ {
6972
+ "type": "{-",
6973
+ "named": false
6974
+ },
6658
6975
  {
6659
6976
  "type": "|",
6660
6977
  "named": false