@willbooster/tree-sitter-c 1.4.0 → 1.4.2

package/grammar.js

@@ -44,6 +44,10 @@ module.exports = Object.assign(
     name: 'c',
 
     conflicts: ($) => [
+      [$.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 +61,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 +86,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 +333,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),
           ';'
@@ -461,7 +479,7 @@ module.exports = Object.assign(
               '*',
               repeat($.attribute_declaration),
               repeat($.ms_pointer_modifier),
-              repeat($.type_qualifier),
+              repeat(choice($.type_qualifier, $.attribute_specifier)),
               field('declarator', $._declarator)
             )
           )
@@ -475,7 +493,7 @@ module.exports = Object.assign(
               '*',
               repeat($.attribute_declaration),
               repeat($.ms_pointer_modifier),
-              repeat($.type_qualifier),
+              repeat(choice($.type_qualifier, $.attribute_specifier)),
               field('declarator', $._field_declarator)
             )
           )
@@ -489,7 +507,7 @@ module.exports = Object.assign(
               '*',
               repeat($.attribute_declaration),
               repeat($.ms_pointer_modifier),
-              repeat($.type_qualifier),
+              repeat(choice($.type_qualifier, $.attribute_specifier)),
               field('declarator', $._type_declarator)
             )
           )
@@ -502,7 +520,7 @@ module.exports = Object.assign(
               '*',
               repeat($.attribute_declaration),
               repeat($.ms_pointer_modifier),
-              repeat($.type_qualifier),
+              repeat(choice($.type_qualifier, $.attribute_specifier)),
               field('declarator', optional($._abstract_declarator))
             )
           )
@@ -626,18 +644,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 +671,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: ($) =>

package/package.json

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

package/src/node-types.json

@@ -303,6 +303,10 @@
     "type": "type_specifier",
     "named": true,
     "subtypes": [
+      {
+        "type": "atomic_type_specifier",
+        "named": true
+      },
       {
         "type": "bit_int_specifier",
         "named": true
@@ -449,6 +453,10 @@
           "type": "attribute_declaration",
           "named": true
         },
+        {
+          "type": "attribute_specifier",
+          "named": true
+        },
         {
           "type": "ms_pointer_modifier",
           "named": true
@@ -666,6 +674,22 @@
       }
     }
   },
+  {
+    "type": "atomic_type_specifier",
+    "named": true,
+    "fields": {
+      "type": {
+        "multiple": false,
+        "required": true,
+        "types": [
+          {
+            "type": "type_descriptor",
+            "named": true
+          }
+        ]
+      }
+    }
+  },
   {
     "type": "attribute",
     "named": true,
@@ -2775,6 +2799,10 @@
           "type": "attribute_declaration",
           "named": true
         },
+        {
+          "type": "attribute_specifier",
+          "named": true
+        },
         {
           "type": "ms_based_modifier",
           "named": true
@@ -4011,13 +4039,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
         }
       ]
     }

package/tree-sitter.json

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