@willbooster/tree-sitter-cpp 3.0.5 → 5.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.
package/README.md CHANGED
@@ -20,7 +20,7 @@ This fork fixes parsing bugs and raises conformance with the ISO C++ standard
20
20
  The npm package ships `tree-sitter-cpp.wasm` for
21
21
  [@willbooster/web-tree-sitter](https://www.npmjs.com/package/@willbooster/web-tree-sitter), which runs in Node.js, Bun,
22
22
  browsers, and Cloudflare Workers. The parser carries the ABI number of the WillBooster/tree-sitter fork, so it loads
23
- only with that runtime, version 2.0.0 or later; upstream's runtime rejects it. Install both:
23
+ only with that runtime, version 4.0.2 or later within major version 4; upstream's runtime rejects it. Install both:
24
24
 
25
25
  ```sh
26
26
  npm install @willbooster/tree-sitter-cpp @willbooster/web-tree-sitter
@@ -68,12 +68,12 @@ grammar's in `queries/` and, in `queries/c/`, the highlights of the C grammar it
68
68
 
69
69
  In Rust, depend on the [crate](https://crates.io/crates/willbooster-tree-sitter-cpp) and on
70
70
  [willbooster-tree-sitter](https://crates.io/crates/willbooster-tree-sitter), the runtime this package is tested and
71
- fuzzed with. The parser loads only with that runtime, version 2.0.0 or later:
71
+ fuzzed with. The parser loads only with that runtime, version 4.0.2 or later within major version 4:
72
72
 
73
73
  ```toml
74
74
  [dependencies]
75
- tree-sitter = { package = "willbooster-tree-sitter", version = "2.0.0" }
76
- tree-sitter-cpp = { package = "willbooster-tree-sitter-cpp", version = "3" }
75
+ tree-sitter = { package = "willbooster-tree-sitter", version = "4.0.2" }
76
+ tree-sitter-cpp = { package = "willbooster-tree-sitter-cpp", version = "5" }
77
77
  ```
78
78
 
79
79
  ```rust
@@ -125,8 +125,8 @@ and the release build regenerate the parsers before compiling them.
125
125
  keyword-led arguments that make `Foo* p(nullptr);` a variable start only with such keywords or `this`, which starts
126
126
  a parameter only when a declaration follows it;
127
127
  - a check (`test/unit/queries.test.ts`) that the queries `tree-sitter.json` lists compile against the grammar, are
128
- published in the npm package and the crate, and that `queries/c/` matches the queries of the installed
129
- @willbooster/tree-sitter-c. After updating that dependency, run `script/copy-c-queries` and `script/copy-c-scanner`.
128
+ published in the npm package and the crate, and that the vendored scanner headers match the installed
129
+ @willbooster/tree-sitter-c. The copied C highlight query excludes the C-only `_Countof` capture. After updating that dependency, run `script/copy-c-queries` and `script/copy-c-scanner`.
130
130
  The scanner headers are verbatim copies from that package; their generator paths refer to the C repository.
131
131
  Review the C scanner dispatch and external-token order against `src/scanner.c` when updating the dependency;
132
132
  - a check (`test/unit/runtimeVersion.test.ts`) that `@willbooster/web-tree-sitter` in `package.json` and
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@willbooster/tree-sitter-cpp",
3
- "version": "3.0.5",
3
+ "version": "5.0.0",
4
4
  "description": "C++ grammar for tree-sitter",
5
5
  "keywords": [
6
6
  "incremental",
@@ -45,9 +45,9 @@
45
45
  "@vitest/browser-playwright": "5.0.3",
46
46
  "@willbooster/oxfmt-config": "1.2.2",
47
47
  "@willbooster/oxlint-config": "1.4.8",
48
- "@willbooster/tree-sitter-c": "2.0.0",
48
+ "@willbooster/tree-sitter-c": "6.0.0",
49
49
  "@willbooster/wb": "22.26.1",
50
- "@willbooster/web-tree-sitter": "2.0.24",
50
+ "@willbooster/web-tree-sitter": "4.0.2",
51
51
  "conventional-changelog-conventionalcommits": "10.4.1",
52
52
  "lefthook": "2.2.1",
53
53
  "oxfmt": "0.72.0",
@@ -61,7 +61,7 @@
61
61
  "wrangler": "4.149.0"
62
62
  },
63
63
  "peerDependencies": {
64
- "@willbooster/web-tree-sitter": "^2.0.0"
64
+ "@willbooster/web-tree-sitter": "^4.0.2"
65
65
  },
66
66
  "peerDependenciesMeta": {
67
67
  "@willbooster/web-tree-sitter": {
@@ -5,6 +5,7 @@
5
5
 
6
6
  ((storage_class_specifier) @keyword
7
7
  (#eq? @keyword "auto"))
8
+ "_Generic" @keyword
8
9
  "_Thread_local" @keyword
9
10
  "break" @keyword
10
11
  "case" @keyword
@@ -16,6 +17,7 @@
16
17
  "enum" @keyword
17
18
  "extern" @keyword
18
19
  "for" @keyword
20
+ "goto" @keyword
19
21
  "if" @keyword
20
22
  "inline" @keyword
21
23
  "return" @keyword
@@ -30,6 +32,8 @@
30
32
 
31
33
  "#define" @keyword
32
34
  "#elif" @keyword
35
+ "#elifdef" @keyword
36
+ "#elifndef" @keyword
33
37
  "#else" @keyword
34
38
  "#endif" @keyword
35
39
  "#if" @keyword
@@ -54,6 +58,27 @@
54
58
  "==" @operator
55
59
  ">" @operator
56
60
  "||" @operator
61
+ "*=" @operator
62
+ "/=" @operator
63
+ "%=" @operator
64
+ "<<=" @operator
65
+ ">>=" @operator
66
+ "&=" @operator
67
+ "|=" @operator
68
+ "^=" @operator
69
+ "/" @operator
70
+ "%" @operator
71
+ "<=" @operator
72
+ ">=" @operator
73
+ "<<" @operator
74
+ ">>" @operator
75
+ "|" @operator
76
+ "^" @operator
77
+ "~" @operator
78
+ "!" @operator
79
+
80
+ (conditional_expression
81
+ ["?" ":"] @operator)
57
82
 
58
83
  "." @delimiter
59
84
  ";" @delimiter
@@ -41,8 +41,6 @@
41
41
  ; Keywords
42
42
 
43
43
  [
44
- "#elifdef"
45
- "#elifndef"
46
44
  "catch"
47
45
  "class"
48
46
  "co_await"
@@ -85,12 +83,8 @@
85
83
 
86
84
  (raw_string_literal) @string
87
85
 
88
- ; Keywords with the shape of a call
89
-
90
- ((template_function
91
- name: (identifier) @keyword)
92
- (#any-of? @keyword "static_cast" "dynamic_cast" "const_cast" "reinterpret_cast"))
86
+ ["static_cast" "dynamic_cast" "const_cast" "reinterpret_cast" "typeid"] @keyword
93
87
 
94
88
  ((call_expression
95
89
  function: (identifier) @keyword)
96
- (#any-of? @keyword "typeid" "noexcept"))
90
+ (#eq? @keyword "noexcept"))
@@ -255,6 +255,10 @@
255
255
  "type": "lambda_expression",
256
256
  "named": true
257
257
  },
258
+ {
259
+ "type": "named_cast_expression",
260
+ "named": true
261
+ },
258
262
  {
259
263
  "type": "new_expression",
260
264
  "named": true
@@ -275,10 +279,6 @@
275
279
  "type": "pack_index_expression",
276
280
  "named": true
277
281
  },
278
- {
279
- "type": "parameter_pack_expansion",
280
- "named": true
281
- },
282
282
  {
283
283
  "type": "parenthesized_expression",
284
284
  "named": true
@@ -335,6 +335,10 @@
335
335
  "type": "true",
336
336
  "named": true
337
337
  },
338
+ {
339
+ "type": "typeid_expression",
340
+ "named": true
341
+ },
338
342
  {
339
343
  "type": "unary_expression",
340
344
  "named": true
@@ -758,6 +762,10 @@
758
762
  "type": "expression",
759
763
  "named": true
760
764
  },
765
+ {
766
+ "type": "parameter_pack_expansion",
767
+ "named": true
768
+ },
761
769
  {
762
770
  "type": "type_descriptor",
763
771
  "named": true
@@ -792,6 +800,10 @@
792
800
  {
793
801
  "type": "expression",
794
802
  "named": true
803
+ },
804
+ {
805
+ "type": "parameter_pack_expansion",
806
+ "named": true
795
807
  }
796
808
  ]
797
809
  }
@@ -821,15 +833,15 @@
821
833
  "named": true
822
834
  },
823
835
  {
824
- "type": "preproc_defined",
836
+ "type": "parameter_pack_expansion",
825
837
  "named": true
826
838
  },
827
839
  {
828
- "type": "system_lib_string",
840
+ "type": "preproc_defined",
829
841
  "named": true
830
842
  },
831
843
  {
832
- "type": "type_descriptor",
844
+ "type": "system_lib_string",
833
845
  "named": true
834
846
  }
835
847
  ]
@@ -854,6 +866,10 @@
854
866
  {
855
867
  "type": "_type_declarator",
856
868
  "named": true
869
+ },
870
+ {
871
+ "type": "variadic_declarator",
872
+ "named": true
857
873
  }
858
874
  ]
859
875
  },
@@ -1426,27 +1442,7 @@
1426
1442
  "required": false,
1427
1443
  "types": [
1428
1444
  {
1429
- "type": "attributed_statement",
1430
- "named": true
1431
- },
1432
- {
1433
- "type": "break_statement",
1434
- "named": true
1435
- },
1436
- {
1437
- "type": "co_return_statement",
1438
- "named": true
1439
- },
1440
- {
1441
- "type": "co_yield_statement",
1442
- "named": true
1443
- },
1444
- {
1445
- "type": "compound_statement",
1446
- "named": true
1447
- },
1448
- {
1449
- "type": "continue_statement",
1445
+ "type": "attribute_declaration",
1450
1446
  "named": true
1451
1447
  },
1452
1448
  {
@@ -1454,68 +1450,20 @@
1454
1450
  "named": true
1455
1451
  },
1456
1452
  {
1457
- "type": "do_statement",
1458
- "named": true
1459
- },
1460
- {
1461
- "type": "expansion_statement",
1462
- "named": true
1463
- },
1464
- {
1465
- "type": "expression_statement",
1466
- "named": true
1467
- },
1468
- {
1469
- "type": "for_range_loop",
1470
- "named": true
1471
- },
1472
- {
1473
- "type": "for_statement",
1474
- "named": true
1475
- },
1476
- {
1477
- "type": "goto_statement",
1478
- "named": true
1479
- },
1480
- {
1481
- "type": "if_statement",
1482
- "named": true
1483
- },
1484
- {
1485
- "type": "labeled_statement",
1486
- "named": true
1487
- },
1488
- {
1489
- "type": "return_statement",
1490
- "named": true
1491
- },
1492
- {
1493
- "type": "seh_leave_statement",
1494
- "named": true
1495
- },
1496
- {
1497
- "type": "seh_try_statement",
1498
- "named": true
1499
- },
1500
- {
1501
- "type": "switch_statement",
1453
+ "type": "preproc_if",
1502
1454
  "named": true
1503
1455
  },
1504
1456
  {
1505
- "type": "throw_statement",
1457
+ "type": "preproc_ifdef",
1506
1458
  "named": true
1507
1459
  },
1508
1460
  {
1509
- "type": "try_statement",
1461
+ "type": "statement",
1510
1462
  "named": true
1511
1463
  },
1512
1464
  {
1513
1465
  "type": "type_definition",
1514
1466
  "named": true
1515
- },
1516
- {
1517
- "type": "while_statement",
1518
- "named": true
1519
1467
  }
1520
1468
  ]
1521
1469
  }
@@ -1587,6 +1535,10 @@
1587
1535
  {
1588
1536
  "type": "escape_sequence",
1589
1537
  "named": true
1538
+ },
1539
+ {
1540
+ "type": "invalid_escape_sequence",
1541
+ "named": true
1590
1542
  }
1591
1543
  ]
1592
1544
  }
@@ -4382,6 +4334,10 @@
4382
4334
  "type": "initializer_pair",
4383
4335
  "named": true
4384
4336
  },
4337
+ {
4338
+ "type": "parameter_pack_expansion",
4339
+ "named": true
4340
+ },
4385
4341
  {
4386
4342
  "type": "preproc_call",
4387
4343
  "named": true
@@ -4442,6 +4398,10 @@
4442
4398
  {
4443
4399
  "type": "initializer_list",
4444
4400
  "named": true
4401
+ },
4402
+ {
4403
+ "type": "parameter_pack_expansion",
4404
+ "named": true
4445
4405
  }
4446
4406
  ]
4447
4407
  }
@@ -4834,6 +4794,58 @@
4834
4794
  "named": true,
4835
4795
  "fields": {}
4836
4796
  },
4797
+ {
4798
+ "type": "named_cast_expression",
4799
+ "named": true,
4800
+ "fields": {
4801
+ "operator": {
4802
+ "multiple": false,
4803
+ "required": true,
4804
+ "types": [
4805
+ {
4806
+ "type": "const_cast",
4807
+ "named": false
4808
+ },
4809
+ {
4810
+ "type": "dynamic_cast",
4811
+ "named": false
4812
+ },
4813
+ {
4814
+ "type": "reinterpret_cast",
4815
+ "named": false
4816
+ },
4817
+ {
4818
+ "type": "static_cast",
4819
+ "named": false
4820
+ }
4821
+ ]
4822
+ },
4823
+ "type": {
4824
+ "multiple": false,
4825
+ "required": true,
4826
+ "types": [
4827
+ {
4828
+ "type": "type_descriptor",
4829
+ "named": true
4830
+ }
4831
+ ]
4832
+ },
4833
+ "value": {
4834
+ "multiple": false,
4835
+ "required": true,
4836
+ "types": [
4837
+ {
4838
+ "type": "comma_expression",
4839
+ "named": true
4840
+ },
4841
+ {
4842
+ "type": "expression",
4843
+ "named": true
4844
+ }
4845
+ ]
4846
+ }
4847
+ }
4848
+ },
4837
4849
  {
4838
4850
  "type": "namespace_alias_definition",
4839
4851
  "named": true,
@@ -5602,6 +5614,20 @@
5602
5614
  }
5603
5615
  ]
5604
5616
  }
5617
+ },
5618
+ "children": {
5619
+ "multiple": true,
5620
+ "required": false,
5621
+ "types": [
5622
+ {
5623
+ "type": "comment",
5624
+ "named": true
5625
+ },
5626
+ {
5627
+ "type": "pragma_operator",
5628
+ "named": true
5629
+ }
5630
+ ]
5605
5631
  }
5606
5632
  },
5607
5633
  {
@@ -5628,6 +5654,20 @@
5628
5654
  }
5629
5655
  ]
5630
5656
  }
5657
+ },
5658
+ "children": {
5659
+ "multiple": true,
5660
+ "required": false,
5661
+ "types": [
5662
+ {
5663
+ "type": "comment",
5664
+ "named": true
5665
+ },
5666
+ {
5667
+ "type": "pragma_operator",
5668
+ "named": true
5669
+ }
5670
+ ]
5631
5671
  }
5632
5672
  },
5633
5673
  {
@@ -5794,6 +5834,10 @@
5794
5834
  "type": "namespace_definition",
5795
5835
  "named": true
5796
5836
  },
5837
+ {
5838
+ "type": "parameter_pack_expansion",
5839
+ "named": true
5840
+ },
5797
5841
  {
5798
5842
  "type": "preproc_call",
5799
5843
  "named": true
@@ -5974,6 +6018,10 @@
5974
6018
  "type": "namespace_definition",
5975
6019
  "named": true
5976
6020
  },
6021
+ {
6022
+ "type": "parameter_pack_expansion",
6023
+ "named": true
6024
+ },
5977
6025
  {
5978
6026
  "type": "preproc_call",
5979
6027
  "named": true
@@ -6125,6 +6173,10 @@
6125
6173
  "type": "namespace_definition",
6126
6174
  "named": true
6127
6175
  },
6176
+ {
6177
+ "type": "parameter_pack_expansion",
6178
+ "named": true
6179
+ },
6128
6180
  {
6129
6181
  "type": "preproc_call",
6130
6182
  "named": true
@@ -6218,6 +6270,20 @@
6218
6270
  }
6219
6271
  ]
6220
6272
  }
6273
+ },
6274
+ "children": {
6275
+ "multiple": true,
6276
+ "required": false,
6277
+ "types": [
6278
+ {
6279
+ "type": "comment",
6280
+ "named": true
6281
+ },
6282
+ {
6283
+ "type": "pragma_operator",
6284
+ "named": true
6285
+ }
6286
+ ]
6221
6287
  }
6222
6288
  },
6223
6289
  {
@@ -6369,6 +6435,10 @@
6369
6435
  "type": "namespace_definition",
6370
6436
  "named": true
6371
6437
  },
6438
+ {
6439
+ "type": "parameter_pack_expansion",
6440
+ "named": true
6441
+ },
6372
6442
  {
6373
6443
  "type": "preproc_call",
6374
6444
  "named": true
@@ -6549,6 +6619,10 @@
6549
6619
  "type": "namespace_definition",
6550
6620
  "named": true
6551
6621
  },
6622
+ {
6623
+ "type": "parameter_pack_expansion",
6624
+ "named": true
6625
+ },
6552
6626
  {
6553
6627
  "type": "preproc_call",
6554
6628
  "named": true
@@ -6634,6 +6708,20 @@
6634
6708
  }
6635
6709
  ]
6636
6710
  }
6711
+ },
6712
+ "children": {
6713
+ "multiple": true,
6714
+ "required": false,
6715
+ "types": [
6716
+ {
6717
+ "type": "comment",
6718
+ "named": true
6719
+ },
6720
+ {
6721
+ "type": "pragma_operator",
6722
+ "named": true
6723
+ }
6724
+ ]
6637
6725
  }
6638
6726
  },
6639
6727
  {
@@ -7220,6 +7308,10 @@
7220
7308
  "type": "escape_sequence",
7221
7309
  "named": true
7222
7310
  },
7311
+ {
7312
+ "type": "invalid_escape_sequence",
7313
+ "named": true
7314
+ },
7223
7315
  {
7224
7316
  "type": "string_content",
7225
7317
  "named": true
@@ -7329,6 +7421,10 @@
7329
7421
  {
7330
7422
  "type": "initializer_list",
7331
7423
  "named": true
7424
+ },
7425
+ {
7426
+ "type": "parameter_pack_expansion",
7427
+ "named": true
7332
7428
  }
7333
7429
  ]
7334
7430
  }
@@ -7438,6 +7534,10 @@
7438
7534
  "type": "expression",
7439
7535
  "named": true
7440
7536
  },
7537
+ {
7538
+ "type": "parameter_pack_expansion",
7539
+ "named": true
7540
+ },
7441
7541
  {
7442
7542
  "type": "type_descriptor",
7443
7543
  "named": true
@@ -8166,6 +8266,36 @@
8166
8266
  ]
8167
8267
  }
8168
8268
  },
8269
+ {
8270
+ "type": "typeid_expression",
8271
+ "named": true,
8272
+ "fields": {
8273
+ "type": {
8274
+ "multiple": false,
8275
+ "required": false,
8276
+ "types": [
8277
+ {
8278
+ "type": "type_descriptor",
8279
+ "named": true
8280
+ }
8281
+ ]
8282
+ },
8283
+ "value": {
8284
+ "multiple": false,
8285
+ "required": false,
8286
+ "types": [
8287
+ {
8288
+ "type": "comma_expression",
8289
+ "named": true
8290
+ },
8291
+ {
8292
+ "type": "expression",
8293
+ "named": true
8294
+ }
8295
+ ]
8296
+ }
8297
+ }
8298
+ },
8169
8299
  {
8170
8300
  "type": "typeof_specifier",
8171
8301
  "named": true,
@@ -8448,6 +8578,10 @@
8448
8578
  "multiple": false,
8449
8579
  "required": true,
8450
8580
  "types": [
8581
+ {
8582
+ "type": "array_declarator",
8583
+ "named": true
8584
+ },
8451
8585
  {
8452
8586
  "type": "pointer_declarator",
8453
8587
  "named": true
@@ -9107,6 +9241,10 @@
9107
9241
  "type": "const",
9108
9242
  "named": false
9109
9243
  },
9244
+ {
9245
+ "type": "const_cast",
9246
+ "named": false
9247
+ },
9110
9248
  {
9111
9249
  "type": "consteval",
9112
9250
  "named": false
@@ -9143,6 +9281,10 @@
9143
9281
  "type": "do",
9144
9282
  "named": false
9145
9283
  },
9284
+ {
9285
+ "type": "dynamic_cast",
9286
+ "named": false
9287
+ },
9146
9288
  {
9147
9289
  "type": "else",
9148
9290
  "named": false
@@ -9207,6 +9349,10 @@
9207
9349
  "type": "inline",
9208
9350
  "named": false
9209
9351
  },
9352
+ {
9353
+ "type": "invalid_escape_sequence",
9354
+ "named": true
9355
+ },
9210
9356
  {
9211
9357
  "type": "literal_suffix",
9212
9358
  "named": true
@@ -9340,6 +9486,10 @@
9340
9486
  "type": "register",
9341
9487
  "named": false
9342
9488
  },
9489
+ {
9490
+ "type": "reinterpret_cast",
9491
+ "named": false
9492
+ },
9343
9493
  {
9344
9494
  "type": "requires",
9345
9495
  "named": false
@@ -9376,6 +9526,10 @@
9376
9526
  "type": "static_assert",
9377
9527
  "named": false
9378
9528
  },
9529
+ {
9530
+ "type": "static_cast",
9531
+ "named": false
9532
+ },
9379
9533
  {
9380
9534
  "type": "string_content",
9381
9535
  "named": true
@@ -9424,6 +9578,10 @@
9424
9578
  "type": "typedef",
9425
9579
  "named": false
9426
9580
  },
9581
+ {
9582
+ "type": "typeid",
9583
+ "named": false
9584
+ },
9427
9585
  {
9428
9586
  "type": "typename",
9429
9587
  "named": false
Binary file
package/tree-sitter.json CHANGED
@@ -24,7 +24,7 @@
24
24
  }
25
25
  ],
26
26
  "metadata": {
27
- "version": "3.0.5",
27
+ "version": "5.0.0",
28
28
  "license": "MIT",
29
29
  "description": "C++ grammar for tree-sitter",
30
30
  "authors": [