@willbooster/tree-sitter-c 1.3.0 → 1.4.1

package/grammar.js

@@ -67,6 +67,9 @@ module.exports = Object.assign(
       [$._top_level_item, $._top_level_statement],
       [$.type_specifier, $._top_level_expression_statement],
       [$.type_qualifier, $.extension_expression],
+      [$.storage_class_specifier, $.type_specifier],
+      [$._compound_literal_storage_class_specifier, $.type_specifier],
+      [$._compound_literal_constexpr_specifier, $.type_qualifier],
     ],
 
     externals: () => [sym('pragma_operator'), sym('preproc_arg'), sym('_preproc_newline')],
@@ -458,7 +461,7 @@ module.exports = Object.assign(
               '*',
               repeat($.attribute_declaration),
               repeat($.ms_pointer_modifier),
-              repeat($.type_qualifier),
+              repeat(choice($.type_qualifier, $.attribute_specifier)),
               field('declarator', $._declarator)
             )
           )
@@ -472,7 +475,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)
             )
           )
@@ -486,7 +489,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)
             )
           )
@@ -499,7 +502,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))
             )
           )
@@ -633,7 +636,8 @@ module.exports = Object.assign(
           $.sized_type_specifier,
           alias($._sized_bit_int_specifier, $.sized_type_specifier),
           $.primitive_type,
-          $._type_identifier
+          $._type_identifier,
+          prec.dynamic(-1, alias('thread_local', sym('type_identifier')))
         ),
 
       typeof_specifier: ($) =>
@@ -932,6 +936,7 @@ module.exports = Object.assign(
           $.field_expression,
           $.compound_literal_expression,
           $.identifier,
+          alias('thread_local', $.identifier),
           $.number_literal,
           $._string,
           $.true,
@@ -1145,7 +1150,25 @@ module.exports = Object.assign(
         ),
 
       compound_literal_expression: ($) =>
-        seq('(', field('type', $.type_descriptor), ')', field('value', $.initializer_list)),
+        seq(
+          '(',
+          repeat(
+            seq(
+              optional(
+                field('storage_class', alias($._compound_literal_constexpr_specifier, $.storage_class_specifier))
+              ),
+              field('storage_class', alias($._compound_literal_storage_class_specifier, $.storage_class_specifier))
+            )
+          ),
+          field('type', $.type_descriptor),
+          ')',
+          field('value', $.initializer_list)
+        ),
+
+      _compound_literal_constexpr_specifier: () => 'constexpr',
+
+      _compound_literal_storage_class_specifier: () =>
+        choice('static', 'register', 'thread_local', '_Thread_local', '__thread'),
 
       parenthesized_expression: ($) => seq('(', choice($.expression, $.comma_expression, $.compound_statement), ')'),
 

package/package.json

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

package/src/node-types.json

@@ -449,6 +449,10 @@
           "type": "attribute_declaration",
           "named": true
         },
+        {
+          "type": "attribute_specifier",
+          "named": true
+        },
         {
           "type": "ms_pointer_modifier",
           "named": true
@@ -1145,6 +1149,16 @@
     "type": "compound_literal_expression",
     "named": true,
     "fields": {
+      "storage_class": {
+        "multiple": true,
+        "required": false,
+        "types": [
+          {
+            "type": "storage_class_specifier",
+            "named": true
+          }
+        ]
+      },
       "type": {
         "multiple": false,
         "required": true,
@@ -2765,6 +2779,10 @@
           "type": "attribute_declaration",
           "named": true
         },
+        {
+          "type": "attribute_specifier",
+          "named": true
+        },
         {
           "type": "ms_based_modifier",
           "named": true

package/tree-sitter.json

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