Support attribute statements under case statements (#83)

Wilfred · Sep 18, 2021 · 9bee345 · 9bee345
1 parent 0aeed55
commit 9bee345
Show file tree

Hide file tree

Showing 5 changed files with 40,030 additions and 39,328 deletions.
diff --git a/grammar.js b/grammar.js
@@ -47,6 +47,7 @@ module.exports = grammar({
     [$._type_specifier, $.macro_type_specifier],
     [$.sized_type_specifier],
     [$._declaration_modifiers, $.attributed_statement],
+    [$._declaration_modifiers, $.attributed_non_case_statement],
   ],
 
   word: $ => $.identifier,
@@ -596,6 +597,11 @@ module.exports = grammar({
       $._statement
     ),
 
+    attributed_non_case_statement: $ => seq(
+      repeat1($.attribute_declaration),
+      $._non_case_statement
+    ),
+
     _statement: $ => choice(
       $.case_statement,
       $._non_case_statement
@@ -653,6 +659,7 @@ module.exports = grammar({
       ),
       ':',
       repeat(choice(
+        alias($.attributed_non_case_statement, $.attributed_statement),
         $._non_case_statement,
         $.declaration,
         $.type_definition

diff --git a/src/grammar.json b/src/grammar.json
@@ -3786,6 +3786,22 @@
         }
       ]
     },
+    "attributed_non_case_statement": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "REPEAT1",
+          "content": {
+            "type": "SYMBOL",
+            "name": "attribute_declaration"
+          }
+        },
+        {
+          "type": "SYMBOL",
+          "name": "_non_case_statement"
+        }
+      ]
+    },
     "_statement": {
       "type": "CHOICE",
       "members": [
@@ -4023,6 +4039,15 @@
             "content": {
               "type": "CHOICE",
               "members": [
+                {
+                  "type": "ALIAS",
+                  "content": {
+                    "type": "SYMBOL",
+                    "name": "attributed_non_case_statement"
+                  },
+                  "named": true,
+                  "value": "attributed_statement"
+                },
                 {
                   "type": "SYMBOL",
                   "name": "_non_case_statement"
@@ -6552,6 +6577,10 @@
     [
       "_declaration_modifiers",
       "attributed_statement"
+    ],
+    [
+      "_declaration_modifiers",
+      "attributed_non_case_statement"
     ]
   ],
   "precedences": [],

diff --git a/src/node-types.json b/src/node-types.json
@@ -852,6 +852,10 @@
       "multiple": true,
       "required": false,
       "types": [
+        {
+          "type": "attributed_statement",
+          "named": true
+        },
         {
           "type": "break_statement",
           "named": true