@willbooster/tree-sitter-cpp 1.4.5 → 1.5.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.
package/README.md CHANGED
@@ -119,7 +119,9 @@ that runs here. Run other CLI commands through it as well (e.g. `script/tree-sit
119
119
  a parameter only when a declaration follows it;
120
120
  - a check (`test/unit/queries.test.ts`) that the queries `tree-sitter.json` lists compile against the grammar, are
121
121
  published in the npm package and the crate, and that `queries/c/` matches the queries of the installed
122
- @willbooster/tree-sitter-c; after updating that dependency, `script/copy-c-queries` refreshes the copy;
122
+ @willbooster/tree-sitter-c. After updating that dependency, run `script/copy-c-queries` and `script/copy-c-scanner`.
123
+ The scanner headers are verbatim copies from that package; their generator paths refer to the C repository.
124
+ Review the C scanner dispatch and external-token order against `src/scanner.c` when updating the dependency;
123
125
  - a check (`test/unit/runtimeVersion.test.ts`) that `@willbooster/web-tree-sitter` in `package.json` and
124
126
  `willbooster-tree-sitter` in `Cargo.lock` are the same version, since the Wasm tests run on the former and the Rust
125
127
  tests, the fuzzer, and the CLI on the latter;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@willbooster/tree-sitter-cpp",
3
- "version": "1.4.5",
3
+ "version": "1.5.0",
4
4
  "description": "C++ grammar for tree-sitter",
5
5
  "keywords": [
6
6
  "incremental",
@@ -44,7 +44,7 @@
44
44
  "@vitest/browser-playwright": "5.0.1",
45
45
  "@willbooster/oxfmt-config": "1.2.2",
46
46
  "@willbooster/oxlint-config": "1.4.8",
47
- "@willbooster/tree-sitter-c": "1.1.6",
47
+ "@willbooster/tree-sitter-c": "1.5.1",
48
48
  "@willbooster/wb": "22.13.2",
49
49
  "@willbooster/web-tree-sitter": "1.1.1",
50
50
  "conventional-changelog-conventionalcommits": "10.4.0",
@@ -3,6 +3,9 @@
3
3
  ((identifier) @constant
4
4
  (#match? @constant "^[A-Z][A-Z\\d_]*$"))
5
5
 
6
+ ((storage_class_specifier) @keyword
7
+ (#eq? @keyword "auto"))
8
+ "_Thread_local" @keyword
6
9
  "break" @keyword
7
10
  "case" @keyword
8
11
  "const" @keyword
@@ -79,3 +82,10 @@
79
82
  name: (identifier) @function.special)
80
83
 
81
84
  (comment) @comment
85
+
86
+ (typeof_specifier
87
+ ["typeof" "typeof_unqual" "__typeof__" "__typeof" "__typeof_unqual" "__typeof_unqual__"] @keyword)
88
+ (bit_int_specifier "_BitInt" @type)
89
+ (pragma_operator) @keyword
90
+
91
+ (va_arg_expression ["va_arg" "__builtin_va_arg"] @keyword)
@@ -346,6 +346,10 @@
346
346
  {
347
347
  "type": "user_defined_literal",
348
348
  "named": true
349
+ },
350
+ {
351
+ "type": "va_arg_expression",
352
+ "named": true
349
353
  }
350
354
  ]
351
355
  },
@@ -667,6 +671,10 @@
667
671
  "type": "attribute_declaration",
668
672
  "named": true
669
673
  },
674
+ {
675
+ "type": "attribute_specifier",
676
+ "named": true
677
+ },
670
678
  {
671
679
  "type": "ms_pointer_modifier",
672
680
  "named": true
@@ -808,6 +816,10 @@
808
816
  "type": "preproc_defined",
809
817
  "named": true
810
818
  },
819
+ {
820
+ "type": "system_lib_string",
821
+ "named": true
822
+ },
811
823
  {
812
824
  "type": "type_descriptor",
813
825
  "named": true
@@ -955,6 +967,22 @@
955
967
  }
956
968
  }
957
969
  },
970
+ {
971
+ "type": "atomic_type_specifier",
972
+ "named": true,
973
+ "fields": {
974
+ "type": {
975
+ "multiple": false,
976
+ "required": true,
977
+ "types": [
978
+ {
979
+ "type": "type_descriptor",
980
+ "named": true
981
+ }
982
+ ]
983
+ }
984
+ }
985
+ },
958
986
  {
959
987
  "type": "attribute",
960
988
  "named": true,
@@ -1268,6 +1296,21 @@
1268
1296
  }
1269
1297
  }
1270
1298
  },
1299
+ {
1300
+ "type": "bit_int_specifier",
1301
+ "named": true,
1302
+ "fields": {},
1303
+ "children": {
1304
+ "multiple": false,
1305
+ "required": true,
1306
+ "types": [
1307
+ {
1308
+ "type": "expression",
1309
+ "named": true
1310
+ }
1311
+ ]
1312
+ }
1313
+ },
1271
1314
  {
1272
1315
  "type": "bitfield_clause",
1273
1316
  "named": true,
@@ -1349,6 +1392,16 @@
1349
1392
  "type": "case_statement",
1350
1393
  "named": true,
1351
1394
  "fields": {
1395
+ "end_value": {
1396
+ "multiple": false,
1397
+ "required": false,
1398
+ "types": [
1399
+ {
1400
+ "type": "expression",
1401
+ "named": true
1402
+ }
1403
+ ]
1404
+ },
1352
1405
  "value": {
1353
1406
  "multiple": false,
1354
1407
  "required": false,
@@ -1688,6 +1741,16 @@
1688
1741
  "type": "compound_literal_expression",
1689
1742
  "named": true,
1690
1743
  "fields": {
1744
+ "storage_class": {
1745
+ "multiple": true,
1746
+ "required": false,
1747
+ "types": [
1748
+ {
1749
+ "type": "storage_class_specifier",
1750
+ "named": true
1751
+ }
1752
+ ]
1753
+ },
1691
1754
  "type": {
1692
1755
  "multiple": true,
1693
1756
  "required": true,
@@ -1797,6 +1860,10 @@
1797
1860
  "type": "linkage_specification",
1798
1861
  "named": true
1799
1862
  },
1863
+ {
1864
+ "type": "ms_declspec_modifier",
1865
+ "named": true
1866
+ },
1800
1867
  {
1801
1868
  "type": "namespace_alias_definition",
1802
1869
  "named": true
@@ -2368,6 +2435,10 @@
2368
2435
  "type": "linkage_specification",
2369
2436
  "named": true
2370
2437
  },
2438
+ {
2439
+ "type": "ms_declspec_modifier",
2440
+ "named": true
2441
+ },
2371
2442
  {
2372
2443
  "type": "namespace_alias_definition",
2373
2444
  "named": true
@@ -2870,7 +2941,7 @@
2870
2941
  "named": true,
2871
2942
  "fields": {},
2872
2943
  "children": {
2873
- "multiple": false,
2944
+ "multiple": true,
2874
2945
  "required": true,
2875
2946
  "types": [
2876
2947
  {
@@ -2909,6 +2980,10 @@
2909
2980
  "type": "linkage_specification",
2910
2981
  "named": true
2911
2982
  },
2983
+ {
2984
+ "type": "ms_declspec_modifier",
2985
+ "named": true
2986
+ },
2912
2987
  {
2913
2988
  "type": "namespace_alias_definition",
2914
2989
  "named": true
@@ -3632,6 +3707,10 @@
3632
3707
  "type": "attribute_declaration",
3633
3708
  "named": true
3634
3709
  },
3710
+ {
3711
+ "type": "attribute_specifier",
3712
+ "named": true
3713
+ },
3635
3714
  {
3636
3715
  "type": "declaration",
3637
3716
  "named": true
@@ -4104,6 +4183,14 @@
4104
4183
  "multiple": false,
4105
4184
  "required": true,
4106
4185
  "types": [
4186
+ {
4187
+ "type": "comma_expression",
4188
+ "named": true
4189
+ },
4190
+ {
4191
+ "type": "expression",
4192
+ "named": true
4193
+ },
4107
4194
  {
4108
4195
  "type": "statement_identifier",
4109
4196
  "named": true
@@ -4278,6 +4365,26 @@
4278
4365
  {
4279
4366
  "type": "initializer_pair",
4280
4367
  "named": true
4368
+ },
4369
+ {
4370
+ "type": "preproc_call",
4371
+ "named": true
4372
+ },
4373
+ {
4374
+ "type": "preproc_def",
4375
+ "named": true
4376
+ },
4377
+ {
4378
+ "type": "preproc_function_def",
4379
+ "named": true
4380
+ },
4381
+ {
4382
+ "type": "preproc_if",
4383
+ "named": true
4384
+ },
4385
+ {
4386
+ "type": "preproc_ifdef",
4387
+ "named": true
4281
4388
  }
4282
4389
  ]
4283
4390
  }
@@ -5397,6 +5504,10 @@
5397
5504
  "type": "attribute_declaration",
5398
5505
  "named": true
5399
5506
  },
5507
+ {
5508
+ "type": "attribute_specifier",
5509
+ "named": true
5510
+ },
5400
5511
  {
5401
5512
  "type": "ms_based_modifier",
5402
5513
  "named": true
@@ -5602,6 +5713,10 @@
5602
5713
  "type": "export_declaration",
5603
5714
  "named": true
5604
5715
  },
5716
+ {
5717
+ "type": "expression",
5718
+ "named": true
5719
+ },
5605
5720
  {
5606
5721
  "type": "field_declaration",
5607
5722
  "named": true
@@ -5622,6 +5737,14 @@
5622
5737
  "type": "import_declaration",
5623
5738
  "named": true
5624
5739
  },
5740
+ {
5741
+ "type": "initializer_list",
5742
+ "named": true
5743
+ },
5744
+ {
5745
+ "type": "initializer_pair",
5746
+ "named": true
5747
+ },
5625
5748
  {
5626
5749
  "type": "linkage_specification",
5627
5750
  "named": true
@@ -5630,6 +5753,10 @@
5630
5753
  "type": "module_declaration",
5631
5754
  "named": true
5632
5755
  },
5756
+ {
5757
+ "type": "ms_declspec_modifier",
5758
+ "named": true
5759
+ },
5633
5760
  {
5634
5761
  "type": "namespace_alias_definition",
5635
5762
  "named": true
@@ -5762,6 +5889,10 @@
5762
5889
  "type": "export_declaration",
5763
5890
  "named": true
5764
5891
  },
5892
+ {
5893
+ "type": "expression",
5894
+ "named": true
5895
+ },
5765
5896
  {
5766
5897
  "type": "field_declaration",
5767
5898
  "named": true
@@ -5782,6 +5913,14 @@
5782
5913
  "type": "import_declaration",
5783
5914
  "named": true
5784
5915
  },
5916
+ {
5917
+ "type": "initializer_list",
5918
+ "named": true
5919
+ },
5920
+ {
5921
+ "type": "initializer_pair",
5922
+ "named": true
5923
+ },
5785
5924
  {
5786
5925
  "type": "linkage_specification",
5787
5926
  "named": true
@@ -5790,6 +5929,10 @@
5790
5929
  "type": "module_declaration",
5791
5930
  "named": true
5792
5931
  },
5932
+ {
5933
+ "type": "ms_declspec_modifier",
5934
+ "named": true
5935
+ },
5793
5936
  {
5794
5937
  "type": "namespace_alias_definition",
5795
5938
  "named": true
@@ -5893,6 +6036,10 @@
5893
6036
  "type": "export_declaration",
5894
6037
  "named": true
5895
6038
  },
6039
+ {
6040
+ "type": "expression",
6041
+ "named": true
6042
+ },
5896
6043
  {
5897
6044
  "type": "field_declaration",
5898
6045
  "named": true
@@ -5913,6 +6060,14 @@
5913
6060
  "type": "import_declaration",
5914
6061
  "named": true
5915
6062
  },
6063
+ {
6064
+ "type": "initializer_list",
6065
+ "named": true
6066
+ },
6067
+ {
6068
+ "type": "initializer_pair",
6069
+ "named": true
6070
+ },
5916
6071
  {
5917
6072
  "type": "linkage_specification",
5918
6073
  "named": true
@@ -5921,6 +6076,10 @@
5921
6076
  "type": "module_declaration",
5922
6077
  "named": true
5923
6078
  },
6079
+ {
6080
+ "type": "ms_declspec_modifier",
6081
+ "named": true
6082
+ },
5924
6083
  {
5925
6084
  "type": "namespace_alias_definition",
5926
6085
  "named": true
@@ -6117,6 +6276,10 @@
6117
6276
  "type": "export_declaration",
6118
6277
  "named": true
6119
6278
  },
6279
+ {
6280
+ "type": "expression",
6281
+ "named": true
6282
+ },
6120
6283
  {
6121
6284
  "type": "field_declaration",
6122
6285
  "named": true
@@ -6137,6 +6300,14 @@
6137
6300
  "type": "import_declaration",
6138
6301
  "named": true
6139
6302
  },
6303
+ {
6304
+ "type": "initializer_list",
6305
+ "named": true
6306
+ },
6307
+ {
6308
+ "type": "initializer_pair",
6309
+ "named": true
6310
+ },
6140
6311
  {
6141
6312
  "type": "linkage_specification",
6142
6313
  "named": true
@@ -6145,6 +6316,10 @@
6145
6316
  "type": "module_declaration",
6146
6317
  "named": true
6147
6318
  },
6319
+ {
6320
+ "type": "ms_declspec_modifier",
6321
+ "named": true
6322
+ },
6148
6323
  {
6149
6324
  "type": "namespace_alias_definition",
6150
6325
  "named": true
@@ -6277,6 +6452,10 @@
6277
6452
  "type": "export_declaration",
6278
6453
  "named": true
6279
6454
  },
6455
+ {
6456
+ "type": "expression",
6457
+ "named": true
6458
+ },
6280
6459
  {
6281
6460
  "type": "field_declaration",
6282
6461
  "named": true
@@ -6297,6 +6476,14 @@
6297
6476
  "type": "import_declaration",
6298
6477
  "named": true
6299
6478
  },
6479
+ {
6480
+ "type": "initializer_list",
6481
+ "named": true
6482
+ },
6483
+ {
6484
+ "type": "initializer_pair",
6485
+ "named": true
6486
+ },
6300
6487
  {
6301
6488
  "type": "linkage_specification",
6302
6489
  "named": true
@@ -6305,6 +6492,10 @@
6305
6492
  "type": "module_declaration",
6306
6493
  "named": true
6307
6494
  },
6495
+ {
6496
+ "type": "ms_declspec_modifier",
6497
+ "named": true
6498
+ },
6308
6499
  {
6309
6500
  "type": "namespace_alias_definition",
6310
6501
  "named": true
@@ -6828,6 +7019,10 @@
6828
7019
  "multiple": false,
6829
7020
  "required": false,
6830
7021
  "types": [
7022
+ {
7023
+ "type": "bit_int_specifier",
7024
+ "named": true
7025
+ },
6831
7026
  {
6832
7027
  "type": "primitive_type",
6833
7028
  "named": true
@@ -7244,6 +7439,10 @@
7244
7439
  "type": "function_definition",
7245
7440
  "named": true
7246
7441
  },
7442
+ {
7443
+ "type": "ms_declspec_modifier",
7444
+ "named": true
7445
+ },
7247
7446
  {
7248
7447
  "type": "requires_clause",
7249
7448
  "named": true
@@ -7620,6 +7819,10 @@
7620
7819
  "type": "module_declaration",
7621
7820
  "named": true
7622
7821
  },
7822
+ {
7823
+ "type": "ms_declspec_modifier",
7824
+ "named": true
7825
+ },
7623
7826
  {
7624
7827
  "type": "namespace_alias_definition",
7625
7828
  "named": true
@@ -7751,9 +7954,21 @@
7751
7954
  "multiple": false,
7752
7955
  "required": true,
7753
7956
  "types": [
7957
+ {
7958
+ "type": "atomic_type_specifier",
7959
+ "named": true
7960
+ },
7961
+ {
7962
+ "type": "bit_int_specifier",
7963
+ "named": true
7964
+ },
7754
7965
  {
7755
7966
  "type": "type_specifier",
7756
7967
  "named": true
7968
+ },
7969
+ {
7970
+ "type": "typeof_specifier",
7971
+ "named": true
7757
7972
  }
7758
7973
  ]
7759
7974
  }
@@ -7762,13 +7977,57 @@
7762
7977
  "multiple": true,
7763
7978
  "required": false,
7764
7979
  "types": [
7980
+ {
7981
+ "type": "atomic_type_specifier",
7982
+ "named": true
7983
+ },
7984
+ {
7985
+ "type": "attribute_declaration",
7986
+ "named": true
7987
+ },
7765
7988
  {
7766
7989
  "type": "attribute_specifier",
7767
7990
  "named": true
7768
7991
  },
7992
+ {
7993
+ "type": "bit_int_specifier",
7994
+ "named": true
7995
+ },
7996
+ {
7997
+ "type": "enum_specifier",
7998
+ "named": true
7999
+ },
8000
+ {
8001
+ "type": "ms_declspec_modifier",
8002
+ "named": true
8003
+ },
8004
+ {
8005
+ "type": "primitive_type",
8006
+ "named": true
8007
+ },
8008
+ {
8009
+ "type": "sized_type_specifier",
8010
+ "named": true
8011
+ },
8012
+ {
8013
+ "type": "storage_class_specifier",
8014
+ "named": true
8015
+ },
8016
+ {
8017
+ "type": "struct_specifier",
8018
+ "named": true
8019
+ },
7769
8020
  {
7770
8021
  "type": "type_qualifier",
7771
8022
  "named": true
8023
+ },
8024
+ {
8025
+ "type": "typeof_specifier",
8026
+ "named": true
8027
+ },
8028
+ {
8029
+ "type": "union_specifier",
8030
+ "named": true
7772
8031
  }
7773
8032
  ]
7774
8033
  }
@@ -7866,6 +8125,29 @@
7866
8125
  ]
7867
8126
  }
7868
8127
  },
8128
+ {
8129
+ "type": "typeof_specifier",
8130
+ "named": true,
8131
+ "fields": {},
8132
+ "children": {
8133
+ "multiple": false,
8134
+ "required": true,
8135
+ "types": [
8136
+ {
8137
+ "type": "comma_expression",
8138
+ "named": true
8139
+ },
8140
+ {
8141
+ "type": "expression",
8142
+ "named": true
8143
+ },
8144
+ {
8145
+ "type": "type_descriptor",
8146
+ "named": true
8147
+ }
8148
+ ]
8149
+ }
8150
+ },
7869
8151
  {
7870
8152
  "type": "unary_expression",
7871
8153
  "named": true,
@@ -8076,6 +8358,32 @@
8076
8358
  ]
8077
8359
  }
8078
8360
  },
8361
+ {
8362
+ "type": "va_arg_expression",
8363
+ "named": true,
8364
+ "fields": {
8365
+ "type": {
8366
+ "multiple": false,
8367
+ "required": true,
8368
+ "types": [
8369
+ {
8370
+ "type": "type_descriptor",
8371
+ "named": true
8372
+ }
8373
+ ]
8374
+ },
8375
+ "value": {
8376
+ "multiple": false,
8377
+ "required": true,
8378
+ "types": [
8379
+ {
8380
+ "type": "expression",
8381
+ "named": true
8382
+ }
8383
+ ]
8384
+ }
8385
+ }
8386
+ },
8079
8387
  {
8080
8388
  "type": "variadic_declarator",
8081
8389
  "named": true,
@@ -8501,10 +8809,22 @@
8501
8809
  "type": "_Atomic",
8502
8810
  "named": false
8503
8811
  },
8812
+ {
8813
+ "type": "_BitInt",
8814
+ "named": false
8815
+ },
8816
+ {
8817
+ "type": "_Complex",
8818
+ "named": false
8819
+ },
8504
8820
  {
8505
8821
  "type": "_Generic",
8506
8822
  "named": false
8507
8823
  },
8824
+ {
8825
+ "type": "_Imaginary",
8826
+ "named": false
8827
+ },
8508
8828
  {
8509
8829
  "type": "_Nonnull",
8510
8830
  "named": false
@@ -8513,6 +8833,10 @@
8513
8833
  "type": "_Noreturn",
8514
8834
  "named": false
8515
8835
  },
8836
+ {
8837
+ "type": "_Thread_local",
8838
+ "named": false
8839
+ },
8516
8840
  {
8517
8841
  "type": "__alignof",
8518
8842
  "named": false
@@ -8545,6 +8869,10 @@
8545
8869
  "type": "__builtin_available",
8546
8870
  "named": false
8547
8871
  },
8872
+ {
8873
+ "type": "__builtin_va_arg",
8874
+ "named": false
8875
+ },
8548
8876
  {
8549
8877
  "type": "__cdecl",
8550
8878
  "named": false
@@ -8553,6 +8881,10 @@
8553
8881
  "type": "__clrcall",
8554
8882
  "named": false
8555
8883
  },
8884
+ {
8885
+ "type": "__complex__",
8886
+ "named": false
8887
+ },
8556
8888
  {
8557
8889
  "type": "__declspec",
8558
8890
  "named": false
@@ -8617,6 +8949,22 @@
8617
8949
  "type": "__try",
8618
8950
  "named": false
8619
8951
  },
8952
+ {
8953
+ "type": "__typeof",
8954
+ "named": false
8955
+ },
8956
+ {
8957
+ "type": "__typeof__",
8958
+ "named": false
8959
+ },
8960
+ {
8961
+ "type": "__typeof_unqual",
8962
+ "named": false
8963
+ },
8964
+ {
8965
+ "type": "__typeof_unqual__",
8966
+ "named": false
8967
+ },
8620
8968
  {
8621
8969
  "type": "__unaligned",
8622
8970
  "named": false
@@ -8906,6 +9254,11 @@
8906
9254
  "type": "post",
8907
9255
  "named": false
8908
9256
  },
9257
+ {
9258
+ "type": "pragma_operator",
9259
+ "named": true,
9260
+ "extra": true
9261
+ },
8909
9262
  {
8910
9263
  "type": "pre",
8911
9264
  "named": false
@@ -9034,6 +9387,14 @@
9034
9387
  "type": "typename",
9035
9388
  "named": false
9036
9389
  },
9390
+ {
9391
+ "type": "typeof",
9392
+ "named": false
9393
+ },
9394
+ {
9395
+ "type": "typeof_unqual",
9396
+ "named": false
9397
+ },
9037
9398
  {
9038
9399
  "type": "u\"",
9039
9400
  "named": false
@@ -9070,6 +9431,10 @@
9070
9431
  "type": "using",
9071
9432
  "named": false
9072
9433
  },
9434
+ {
9435
+ "type": "va_arg",
9436
+ "named": false
9437
+ },
9073
9438
  {
9074
9439
  "type": "version_number",
9075
9440
  "named": true
Binary file
package/tree-sitter.json CHANGED
@@ -24,7 +24,7 @@
24
24
  }
25
25
  ],
26
26
  "metadata": {
27
- "version": "1.4.5",
27
+ "version": "1.5.0",
28
28
  "license": "MIT",
29
29
  "description": "C++ grammar for tree-sitter",
30
30
  "authors": [