@willbooster/tree-sitter-c 1.5.1 → 1.5.2

package/grammar.js

@@ -71,6 +71,7 @@ module.exports = Object.assign(
       [$.type_definition, $.sized_type_specifier],
       [$.type_definition, $._sized_bit_int_specifier],
       [$.attributed_statement],
+      [$._single_attributed_statement],
       [$._declaration_modifiers, $.attributed_statement],
       [$.enum_specifier],
       [$.type_specifier, $._old_style_parameter_list],
@@ -218,6 +219,7 @@ module.exports = Object.assign(
         ),
 
       ...preprocIf('', () => sym('_block_item')),
+      ...preprocIf('_in_single_case', () => sym('_single_case_body'), 0, true),
       ...preprocIf('_in_field_declaration_list', () => sym('_field_declaration_list_item')),
       ...preprocIf('_in_enumerator_list', () => seq(sym('enumerator'), ',')),
       ...preprocIf('_in_enumerator_list_no_comma', () => sym('enumerator'), -1),
@@ -901,7 +903,65 @@ module.exports = Object.assign(
       else_clause: ($) => seq('else', $.statement),
 
       switch_statement: ($) =>
-        seq('switch', field('condition', $.parenthesized_expression), field('body', $.compound_statement)),
+        seq('switch', field('condition', $.parenthesized_expression), field('body', $._single_statement)),
+
+      _single_statement: ($) =>
+        choice(
+          $.compound_statement,
+          $.expression_statement,
+          $.switch_statement,
+          $.return_statement,
+          $.break_statement,
+          $.continue_statement,
+          $.goto_statement,
+          $.seh_try_statement,
+          $.seh_leave_statement,
+          alias($._single_case_statement, $.case_statement),
+          alias($._single_labeled_statement, $.labeled_statement),
+          alias($._single_if_statement, $.if_statement),
+          alias($._single_while_statement, $.while_statement),
+          alias($._single_do_statement, $.do_statement),
+          alias($._single_for_statement, $.for_statement),
+          alias($._single_attributed_statement, $.attributed_statement)
+        ),
+
+      _single_case_statement: ($) =>
+        prec.right(
+          seq(
+            choice(
+              seq('case', field('value', $.expression), optional(seq('...', field('end_value', $.expression)))),
+              'default'
+            ),
+            ':',
+            optional($._single_case_body)
+          )
+        ),
+      _single_case_body: ($) =>
+        choice(
+          $._single_statement,
+          $.declaration,
+          $.type_definition,
+          alias(sym('preproc_if_in_single_case'), sym('preproc_if')),
+          alias(sym('preproc_ifdef_in_single_case'), sym('preproc_ifdef'))
+        ),
+      _single_labeled_statement: ($) =>
+        seq(field('label', $._statement_identifier), ':', choice($._single_statement, $.declaration)),
+      _single_if_statement: ($) =>
+        prec.right(
+          seq(
+            'if',
+            field('condition', $.parenthesized_expression),
+            field('consequence', $._single_statement),
+            optional(field('alternative', alias($._single_else_clause, $.else_clause)))
+          )
+        ),
+      _single_else_clause: ($) => seq('else', $._single_statement),
+      _single_while_statement: ($) =>
+        seq('while', field('condition', $.parenthesized_expression), field('body', $._single_statement)),
+      _single_do_statement: ($) =>
+        seq('do', field('body', $._single_statement), 'while', field('condition', $.parenthesized_expression), ';'),
+      _single_for_statement: ($) => seq('for', '(', $._for_statement_body, ')', field('body', $._single_statement)),
+      _single_attributed_statement: ($) => seq(repeat1($.attribute_declaration), $._single_statement),
 
       case_statement: ($) =>
         prec.right(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@willbooster/tree-sitter-c",
-  "version": "1.5.1",
+  "version": "1.5.2",
   "description": "C grammar for tree-sitter",
   "keywords": [
     "incremental",

package/src/node-types.json

@@ -1031,6 +1031,10 @@
           "type": "break_statement",
           "named": true
         },
+        {
+          "type": "case_statement",
+          "named": true
+        },
         {
           "type": "compound_statement",
           "named": true
@@ -1067,6 +1071,14 @@
           "type": "labeled_statement",
           "named": true
         },
+        {
+          "type": "preproc_if",
+          "named": true
+        },
+        {
+          "type": "preproc_ifdef",
+          "named": true
+        },
         {
           "type": "return_statement",
           "named": true
@@ -3880,9 +3892,69 @@
         "multiple": false,
         "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",
+            "named": true
           }
         ]
       },

package/tree-sitter.json

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