@willbooster/tree-sitter-c 1.4.1 → 1.5.0

package/grammar.js

@@ -37,6 +37,7 @@ const PREC = {
 
 const LINE_COMMENT = seq('//', /(\\+(.|\r?\n)|[^\\\n])*/);
 const PRAGMA_SPACING = repeat(choice(/\s/, /\\\r?\n/));
+const VA_ARG_KEYWORDS = choice('va_arg', '__builtin_va_arg');
 
 // oxlint-disable-next-line unicorn/prefer-module -- This package is CommonJS, so tree-sitter loads grammar.js as CommonJS.
 module.exports = Object.assign(
@@ -44,6 +45,12 @@ module.exports = Object.assign(
     name: 'c',
 
     conflicts: ($) => [
+      [$.type_specifier, $.expression, $.va_arg_expression, $.macro_type_specifier],
+      [$.va_arg_expression, $.expression],
+      [$.type_definition, $._declaration_modifiers],
+      [$.type_definition, $.type_specifier],
+      [$.type_definition, $.type_qualifier, $.extension_expression],
+      [$.type_definition, $.type_qualifier],
       [$._declaration_modifiers, $._empty_declaration],
       [$.declaration, $.storage_class_specifier],
       [$.sized_type_specifier, $.enum_specifier],
@@ -57,6 +64,11 @@ module.exports = Object.assign(
       [$.sized_type_specifier],
       [$._sized_bit_int_specifier],
       [$.sized_type_specifier, $._sized_bit_int_specifier],
+      [$._type_declarator, $.sized_type_specifier, $._sized_bit_int_specifier],
+      [$.type_qualifier, $.atomic_type_specifier],
+      [$.type_definition, $._type_declarator],
+      [$.type_definition, $.sized_type_specifier],
+      [$.type_definition, $._sized_bit_int_specifier],
       [$.attributed_statement],
       [$._declaration_modifiers, $.attributed_statement],
       [$.enum_specifier],
@@ -77,6 +89,7 @@ module.exports = Object.assign(
     extras: ($) => [$.pragma_operator, /\s|\\\r?\n/, $.comment],
 
     inline: ($) => [
+      $._non_identifier_type_specifier,
       $._type_identifier,
       $._field_identifier,
       $._statement_identifier,
@@ -323,9 +336,17 @@ module.exports = Object.assign(
 
       type_definition: ($) =>
         seq(
-          optional('__extension__'),
-          'typedef',
-          $._type_definition_type,
+          optional(prec.dynamic(1, '__extension__')),
+          choice(
+            seq(repeat($.type_qualifier), 'typedef', $._type_definition_type),
+            seq(
+              repeat($._declaration_modifiers),
+              field('type', $._non_identifier_type_specifier),
+              repeat($.type_qualifier),
+              'typedef',
+              repeat(choice($.type_qualifier, $._non_identifier_type_specifier))
+            )
+          ),
           $._type_definition_declarators,
           repeat($.attribute_specifier),
           ';'
@@ -396,7 +417,8 @@ module.exports = Object.assign(
           $.function_declarator,
           $.array_declarator,
           $.parenthesized_declarator,
-          $.identifier
+          $.identifier,
+          alias(VA_ARG_KEYWORDS, $.identifier)
         ),
 
       _declaration_declarator: ($) =>
@@ -406,7 +428,8 @@ module.exports = Object.assign(
           alias($._function_declaration_declarator, $.function_declarator),
           $.array_declarator,
           $.parenthesized_declarator,
-          $.identifier
+          $.identifier,
+          alias(VA_ARG_KEYWORDS, $.identifier)
         ),
 
       _field_declarator: ($) =>
@@ -626,18 +649,24 @@ module.exports = Object.assign(
       alignas_qualifier: ($) => seq(choice('alignas', '_Alignas'), '(', choice($.expression, $.type_descriptor), ')'),
 
       type_specifier: ($) =>
+        choice(
+          $._non_identifier_type_specifier,
+          $.macro_type_specifier,
+          $._type_identifier,
+          prec.dynamic(-1, alias('thread_local', sym('type_identifier')))
+        ),
+
+      _non_identifier_type_specifier: ($) =>
         choice(
           $.struct_specifier,
           $.union_specifier,
           $.enum_specifier,
           $.typeof_specifier,
           $.bit_int_specifier,
-          $.macro_type_specifier,
+          $.atomic_type_specifier,
           $.sized_type_specifier,
           alias($._sized_bit_int_specifier, $.sized_type_specifier),
-          $.primitive_type,
-          $._type_identifier,
-          prec.dynamic(-1, alias('thread_local', sym('type_identifier')))
+          $.primitive_type
         ),
 
       typeof_specifier: ($) =>
@@ -647,6 +676,8 @@ module.exports = Object.assign(
           choice($.type_descriptor, $.expression, $.comma_expression),
           ')'
         ),
+      atomic_type_specifier: ($) => seq('_Atomic', '(', field('type', $.type_descriptor), ')'),
+
       bit_int_specifier: ($) => seq('_BitInt', '(', $.expression, ')'),
 
       sized_type_specifier: ($) =>
@@ -786,7 +817,8 @@ module.exports = Object.assign(
 
       parameter_list: ($) =>
         seq('(', choice(commaSep(choice($.parameter_declaration, $.variadic_parameter)), $.compound_statement), ')'),
-      _old_style_parameter_list: ($) => seq('(', commaSep(choice($.identifier, $.variadic_parameter)), ')'),
+      _old_style_parameter_list: ($) =>
+        seq('(', commaSep(choice($.identifier, alias(VA_ARG_KEYWORDS, $.identifier), $.variadic_parameter)), ')'),
 
       parameter_declaration: ($) =>
         seq(
@@ -930,6 +962,7 @@ module.exports = Object.assign(
           $.sizeof_expression,
           $.alignof_expression,
           $.offsetof_expression,
+          $.va_arg_expression,
           $.generic_expression,
           $.subscript_expression,
           $.call_expression,
@@ -937,6 +970,7 @@ module.exports = Object.assign(
           $.compound_literal_expression,
           $.identifier,
           alias('thread_local', $.identifier),
+          alias(VA_ARG_KEYWORDS, $.identifier),
           $.number_literal,
           $._string,
           $.true,
@@ -968,6 +1002,7 @@ module.exports = Object.assign(
 
       _assignment_left_expression: ($) =>
         choice(
+          alias(VA_ARG_KEYWORDS, $.identifier),
           $.identifier,
           $.call_expression,
           $.field_expression,
@@ -1043,17 +1078,23 @@ module.exports = Object.assign(
         ),
 
       sizeof_expression: ($) =>
-        prec(
-          PREC.SIZEOF,
-          seq('sizeof', choice(field('value', $.expression), seq('(', field('type', $.type_descriptor), ')')))
+        prec.dynamic(
+          2,
+          prec(
+            PREC.SIZEOF,
+            seq('sizeof', choice(field('value', $.expression), seq('(', field('type', $.type_descriptor), ')')))
+          )
         ),
 
       alignof_expression: ($) =>
-        prec(
-          PREC.SIZEOF,
-          seq(
-            choice('__alignof__', '__alignof', '_alignof', 'alignof', '_Alignof'),
-            seq('(', field('type', $.type_descriptor), ')')
+        prec.dynamic(
+          2,
+          prec(
+            PREC.SIZEOF,
+            seq(
+              choice('__alignof__', '__alignof', '_alignof', 'alignof', '_Alignof'),
+              seq('(', field('type', $.type_descriptor), ')')
+            )
           )
         ),
 
@@ -1063,6 +1104,12 @@ module.exports = Object.assign(
           seq('offsetof', seq('(', field('type', $.type_descriptor), ',', field('member', $._field_identifier), ')'))
         ),
 
+      va_arg_expression: ($) =>
+        prec.dynamic(
+          1,
+          seq(VA_ARG_KEYWORDS, '(', field('value', $.expression), ',', field('type', $.type_descriptor), ')')
+        ),
+
       generic_expression: ($) =>
         prec(
           PREC.CALL,
@@ -1313,14 +1360,22 @@ module.exports = Object.assign(
       identifier: () =>
         /(\p{XID_Start}|\$|_|\\u[0-9A-Fa-f]{4}|\\U[0-9A-Fa-f]{8})(\p{XID_Continue}|\$|\\u[0-9A-Fa-f]{4}|\\U[0-9A-Fa-f]{8})*/u,
 
-      _type_identifier: ($) => alias($.identifier, sym('type_identifier')),
-      _field_identifier: ($) => alias($.identifier, sym('field_identifier')),
-      _statement_identifier: ($) => alias($.identifier, sym('statement_identifier')),
+      _type_identifier: ($) => alias(choice($.identifier, VA_ARG_KEYWORDS), sym('type_identifier')),
+      _field_identifier: ($) => alias(choice($.identifier, VA_ARG_KEYWORDS), sym('field_identifier')),
+      _statement_identifier: ($) => alias(choice($.identifier, VA_ARG_KEYWORDS), sym('statement_identifier')),
 
       _empty_declaration: ($) => seq(repeat($.ms_declspec_modifier), $.type_specifier, ';'),
 
       macro_type_specifier: ($) =>
-        prec.dynamic(-1, seq(field('name', $.identifier), '(', field('type', $.type_descriptor), ')')),
+        prec.dynamic(
+          -1,
+          seq(
+            field('name', choice($.identifier, alias(VA_ARG_KEYWORDS, $.identifier))),
+            '(',
+            field('type', $.type_descriptor),
+            ')'
+          )
+        ),
 
       // http://stackoverflow.com/questions/13014947/regex-to-match-a-c-style-multiline-comment/36328890#36328890
       comment: () => token(choice(LINE_COMMENT, seq('/*', /[^*]*\*+([^/*][^*]*\*+)*/, '/'))),

package/package.json

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

package/queries/highlights.scm

@@ -87,3 +87,5 @@
   ["typeof" "typeof_unqual" "__typeof__" "__typeof" "__typeof_unqual" "__typeof_unqual__"] @keyword)
 (bit_int_specifier "_BitInt" @type)
 (pragma_operator) @keyword
+
+(va_arg_expression ["va_arg" "__builtin_va_arg"] @keyword)

package/src/node-types.json

@@ -226,6 +226,10 @@
       {
         "type": "update_expression",
         "named": true
+      },
+      {
+        "type": "va_arg_expression",
+        "named": true
       }
     ]
   },
@@ -303,6 +307,10 @@
     "type": "type_specifier",
     "named": true,
     "subtypes": [
+      {
+        "type": "atomic_type_specifier",
+        "named": true
+      },
       {
         "type": "bit_int_specifier",
         "named": true
@@ -670,6 +678,22 @@
       }
     }
   },
+  {
+    "type": "atomic_type_specifier",
+    "named": true,
+    "fields": {
+      "type": {
+        "multiple": false,
+        "required": true,
+        "types": [
+          {
+            "type": "type_descriptor",
+            "named": true
+          }
+        ]
+      }
+    }
+  },
   {
     "type": "attribute",
     "named": true,
@@ -4019,13 +4043,57 @@
       "multiple": true,
       "required": false,
       "types": [
+        {
+          "type": "atomic_type_specifier",
+          "named": true
+        },
+        {
+          "type": "attribute_declaration",
+          "named": true
+        },
         {
           "type": "attribute_specifier",
           "named": true
         },
+        {
+          "type": "bit_int_specifier",
+          "named": true
+        },
+        {
+          "type": "enum_specifier",
+          "named": true
+        },
+        {
+          "type": "ms_declspec_modifier",
+          "named": true
+        },
+        {
+          "type": "primitive_type",
+          "named": true
+        },
+        {
+          "type": "sized_type_specifier",
+          "named": true
+        },
+        {
+          "type": "storage_class_specifier",
+          "named": true
+        },
+        {
+          "type": "struct_specifier",
+          "named": true
+        },
         {
           "type": "type_qualifier",
           "named": true
+        },
+        {
+          "type": "typeof_specifier",
+          "named": true
+        },
+        {
+          "type": "union_specifier",
+          "named": true
         }
       ]
     }
@@ -4216,6 +4284,32 @@
       }
     }
   },
+  {
+    "type": "va_arg_expression",
+    "named": true,
+    "fields": {
+      "type": {
+        "multiple": false,
+        "required": true,
+        "types": [
+          {
+            "type": "type_descriptor",
+            "named": true
+          }
+        ]
+      },
+      "value": {
+        "multiple": false,
+        "required": true,
+        "types": [
+          {
+            "type": "expression",
+            "named": true
+          }
+        ]
+      }
+    }
+  },
   {
     "type": "variadic_parameter",
     "named": true,
@@ -4563,6 +4657,10 @@
     "type": "__builtin_available",
     "named": false
   },
+  {
+    "type": "__builtin_va_arg",
+    "named": false
+  },
   {
     "type": "__cdecl",
     "named": false
@@ -4921,6 +5019,10 @@
     "type": "unsigned",
     "named": false
   },
+  {
+    "type": "va_arg",
+    "named": false
+  },
   {
     "type": "version_number",
     "named": true

package/tree-sitter.json

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