Merge pull request #158 from amaanq/thread-and-more

Minor fixes
tree-sitter · Jul 27, 2023 · 28d910c · 28d910c
2 parents ad09589 + 43a147a
commit 28d910c
Show file tree

Hide file tree

Showing 6 changed files with 64,409 additions and 62,248 deletions.
diff --git a/grammar.js b/grammar.js
@@ -148,7 +148,7 @@ module.exports = grammar({
     ...preprocIf('', $ => $._block_item),
     ...preprocIf('_in_field_declaration_list', $ => $._field_declaration_list_item),
 
-    preproc_arg: _ => token(prec(-1, /\S([^/\n]|\\\r?\n)*/)),
+    preproc_arg: _ => token(prec(-1, /\S([^/\n]|\/[^*]|\\\r?\n)*/)),
     preproc_directive: _ => /#[ \t]*[a-zA-Z0-9]\w*/,
 
     _preproc_expression: $ => choice(
@@ -233,7 +233,7 @@ module.exports = grammar({
     declaration: $ => seq(
       $._declaration_specifiers,
       commaSep1(field('declarator', choice(
-        $._declarator,
+        seq($._declarator, optional($.gnu_asm_expression)),
         $.init_declarator,
       ))),
       ';',
@@ -497,6 +497,7 @@ module.exports = grammar({
       'register',
       'inline',
       'thread_local',
+      '__thread',
     ),
 
     type_qualifier: _ => choice(

diff --git a/src/grammar.json b/src/grammar.json
@@ -1022,7 +1022,7 @@
         "value": -1,
         "content": {
           "type": "PATTERN",
-          "value": "\\S([^/\\n]|\\\\\\r?\\n)*"
+          "value": "\\S([^/\\n]|\\/[^*]|\\\\\\r?\\n)*"
         }
       }
     },
@@ -1918,8 +1918,25 @@
                 "type": "CHOICE",
                 "members": [
                   {
-                    "type": "SYMBOL",
-                    "name": "_declarator"
+                    "type": "SEQ",
+                    "members": [
+                      {
+                        "type": "SYMBOL",
+                        "name": "_declarator"
+                      },
+                      {
+                        "type": "CHOICE",
+                        "members": [
+                          {
+                            "type": "SYMBOL",
+                            "name": "gnu_asm_expression"
+                          },
+                          {
+                            "type": "BLANK"
+                          }
+                        ]
+                      }
+                    ]
                   },
                   {
                     "type": "SYMBOL",
@@ -1944,8 +1961,25 @@
                       "type": "CHOICE",
                       "members": [
                         {
-                          "type": "SYMBOL",
-                          "name": "_declarator"
+                          "type": "SEQ",
+                          "members": [
+                            {
+                              "type": "SYMBOL",
+                              "name": "_declarator"
+                            },
+                            {
+                              "type": "CHOICE",
+                              "members": [
+                                {
+                                  "type": "SYMBOL",
+                                  "name": "gnu_asm_expression"
+                                },
+                                {
+                                  "type": "BLANK"
+                                }
+                              ]
+                            }
+                          ]
                         },
                         {
                           "type": "SYMBOL",
@@ -3321,6 +3355,10 @@
         {
           "type": "STRING",
           "value": "thread_local"
+        },
+        {
+          "type": "STRING",
+          "value": "__thread"
         }
       ]
     },

diff --git a/src/node-types.json b/src/node-types.json
@@ -1171,6 +1171,10 @@
             "type": "_declarator",
             "named": true
           },
+          {
+            "type": "gnu_asm_expression",
+            "named": true
+          },
           {
             "type": "init_declarator",
             "named": true
@@ -3925,6 +3929,10 @@
     "type": "__thiscall",
     "named": false
   },
+  {
+    "type": "__thread",
+    "named": false
+  },
   {
     "type": "__unaligned",
     "named": false