@willbooster/tree-sitter-c 2.0.6 → 4.0.0

package/README.md

@@ -18,7 +18,7 @@ This fork fixes parsing bugs and raises conformance with the ISO C standard
 ## Usage
 
 The npm package ships `tree-sitter-c.wasm` for
-[@willbooster/web-tree-sitter](https://www.npmjs.com/package/@willbooster/web-tree-sitter) version 1.1.6 or later, which runs in Node.js, Bun, browsers, and Cloudflare Workers. In Node.js and Bun, load the grammar from its path:
+[@willbooster/web-tree-sitter](https://www.npmjs.com/package/@willbooster/web-tree-sitter) version 1.3.0 or later, which runs in Node.js, Bun, browsers, and Cloudflare Workers. In Node.js and Bun, load the grammar from its path:
 
 ```js
 import { fileURLToPath } from 'node:url';
@@ -65,13 +65,12 @@ adjacency, so the parameter scanner must skip them again to reach `(`.
 
 In Rust, depend on the [crate](https://crates.io/crates/willbooster-tree-sitter-c) and on
 [willbooster-tree-sitter](https://crates.io/crates/willbooster-tree-sitter), the runtime this package is tested and
-fuzzed with (the grammar also loads in the upstream `tree-sitter` crate 0.27, whose error recovery never ends on some
-malformed input):
+fuzzed with. Restricted switch-body statement queries require this fork’s generator and runtime together:
 
 ```toml
 [dependencies]
-tree-sitter = { package = "willbooster-tree-sitter", version = "1.1.6" }
-tree-sitter-c = { package = "willbooster-tree-sitter-c", version = "2" }
+tree-sitter = { package = "willbooster-tree-sitter", version = "1.3.0" }
+tree-sitter-c = { package = "willbooster-tree-sitter-c", version = "4" }
 ```
 
 ```rust
@@ -97,6 +96,13 @@ not the ones this package ships with. Its first run downloads that CLI from the
 with `cargo` (whose build runs the CMake that `mise.toml` pins) when the download fails or the release has no binary that runs here. Run other CLI commands through it as
 well (e.g. `script/tree-sitter parse file.c`).
 
+`bun run generate` records a fresh ABI 16 generation profile from the applicable `test/corpus` cases and Git-tracked
+files in `examples/`, then generates compact parser tables. The parser also embeds metadata from `tree-sitter.json`. After changing a grammar,
+`tree-sitter.json`, a corpus case, or a tracked example,
+regenerate and commit `src/`. Stage added or removed examples with `git add -A examples` before generation so the profile uses the intended file list.
+Profiles in `.tmp/generation-profiles/` are temporary and must not be committed. `bun run build-wasm`, `bun run build/ci`,
+and the release build regenerate the parsers before compiling them.
+
 `bun run test` runs:
 
 - the corpus in `test/corpus`, with the native build and with the Wasm build (the first run downloads the WASI SDK);

package/grammar.js

@@ -110,6 +110,7 @@ module.exports = Object.assign(
     supertypes: ($) => [
       $.expression,
       $.statement,
+      $._single_noncompound_statement,
       $.type_specifier,
       $._declarator,
       $._field_declarator,
@@ -906,9 +907,10 @@ module.exports = Object.assign(
       switch_statement: ($) =>
         seq('switch', field('condition', $.parenthesized_expression), field('body', $._single_statement)),
 
-      _single_statement: ($) =>
+      _single_statement: ($) => choice($.compound_statement, alias($._single_noncompound_statement, $.statement)),
+
+      _single_noncompound_statement: ($) =>
         choice(
-          $.compound_statement,
           $.expression_statement,
           $.switch_statement,
           $.return_statement,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@willbooster/tree-sitter-c",
-  "version": "2.0.6",
+  "version": "4.0.0",
   "description": "C grammar for tree-sitter",
   "keywords": [
     "incremental",
@@ -26,10 +26,11 @@
     "src/scanner.c"
   ],
   "scripts": {
-    "build-wasm": "script/tree-sitter build --wasm",
-    "build/ci": "script/tree-sitter generate && bun script/generateIdentifierRanges.js && script/tree-sitter build --wasm",
+    "build-wasm": "script/generate --build-wasm",
+    "build/ci": "bun run build-wasm",
     "cleanup": "bun wb lint --fix --format",
     "format": "bun wb lint --format",
+    "generate": "script/generate",
     "lint": "bun wb lint",
     "lint-fix": "bun wb lint --fix",
     "prepare": "(bun lefthook install || true) && (test ! -f .lefthook/normalize-bun-lockfile.sh || bash .lefthook/normalize-bun-lockfile.sh)",
@@ -50,7 +51,7 @@
     "@willbooster/oxfmt-config": "1.2.2",
     "@willbooster/oxlint-config": "1.4.8",
     "@willbooster/wb": "22.13.2",
-    "@willbooster/web-tree-sitter": "1.1.6",
+    "@willbooster/web-tree-sitter": "1.4.0",
     "conventional-changelog-conventionalcommits": "10.4.0",
     "lefthook": "2.1.14",
     "oxfmt": "0.70.0",
@@ -64,7 +65,7 @@
     "wrangler": "4.136.1"
   },
   "peerDependencies": {
-    "@willbooster/web-tree-sitter": "^1.1.6"
+    "@willbooster/web-tree-sitter": "^1.3.0"
   },
   "peerDependenciesMeta": {
     "@willbooster/web-tree-sitter": {

package/src/node-types.json

@@ -1023,54 +1023,10 @@
       "multiple": true,
       "required": false,
       "types": [
-        {
-          "type": "attributed_statement",
-          "named": true
-        },
-        {
-          "type": "break_statement",
-          "named": true
-        },
-        {
-          "type": "case_statement",
-          "named": true
-        },
-        {
-          "type": "compound_statement",
-          "named": true
-        },
-        {
-          "type": "continue_statement",
-          "named": true
-        },
         {
           "type": "declaration",
           "named": true
         },
-        {
-          "type": "do_statement",
-          "named": true
-        },
-        {
-          "type": "expression_statement",
-          "named": true
-        },
-        {
-          "type": "for_statement",
-          "named": true
-        },
-        {
-          "type": "goto_statement",
-          "named": true
-        },
-        {
-          "type": "if_statement",
-          "named": true
-        },
-        {
-          "type": "labeled_statement",
-          "named": true
-        },
         {
           "type": "preproc_if",
           "named": true
@@ -1080,28 +1036,12 @@
           "named": true
         },
         {
-          "type": "return_statement",
-          "named": true
-        },
-        {
-          "type": "seh_leave_statement",
-          "named": true
-        },
-        {
-          "type": "seh_try_statement",
-          "named": true
-        },
-        {
-          "type": "switch_statement",
+          "type": "statement",
           "named": true
         },
         {
           "type": "type_definition",
           "named": true
-        },
-        {
-          "type": "while_statement",
-          "named": true
         }
       ]
     }
@@ -3893,67 +3833,7 @@
         "required": true,
         "types": [
           {
-            "type": "attributed_statement",
-            "named": true
-          },
-          {
-            "type": "break_statement",
-            "named": true
-          },
-          {
-            "type": "case_statement",
-            "named": true
-          },
-          {
-            "type": "compound_statement",
-            "named": true
-          },
-          {
-            "type": "continue_statement",
-            "named": true
-          },
-          {
-            "type": "do_statement",
-            "named": true
-          },
-          {
-            "type": "expression_statement",
-            "named": true
-          },
-          {
-            "type": "for_statement",
-            "named": true
-          },
-          {
-            "type": "goto_statement",
-            "named": true
-          },
-          {
-            "type": "if_statement",
-            "named": true
-          },
-          {
-            "type": "labeled_statement",
-            "named": true
-          },
-          {
-            "type": "return_statement",
-            "named": true
-          },
-          {
-            "type": "seh_leave_statement",
-            "named": true
-          },
-          {
-            "type": "seh_try_statement",
-            "named": true
-          },
-          {
-            "type": "switch_statement",
-            "named": true
-          },
-          {
-            "type": "while_statement",
+            "type": "statement",
             "named": true
           }
         ]

package/tree-sitter.json

@@ -16,7 +16,7 @@
     }
   ],
   "metadata": {
-    "version": "2.0.6",
+    "version": "4.0.0",
     "license": "MIT",
     "description": "C grammar for tree-sitter",
     "authors": [