Restrucure case clauses - move colons into case nodes

tree-sitter · Oct 29, 2018 · 0e8a1c1 · 0e8a1c1
1 parent abed789
commit 0e8a1c1
Show file tree

Hide file tree

Showing 3 changed files with 17,360 additions and 17,084 deletions.
diff --git a/grammar.js b/grammar.js
@@ -514,16 +514,19 @@ module.exports = grammar({
 
     expression_case_clause: $ => seq(
       choice($.expression_case, $.default_case),
-      ':',
       optional($._statement_list)
     ),
 
     expression_case: $ => seq(
       'case',
-      $.expression_list
+      $.expression_list,
+      ':'
     ),
 
-    default_case: $ => 'default',
+    default_case: $ => seq(
+      'default',
+      ':'
+    ),
 
     type_switch_statement: $ => seq(
       'switch',
@@ -544,13 +547,13 @@ module.exports = grammar({
 
     type_case_clause: $ => seq(
       choice($.type_case, $.default_case),
-      ':',
       optional($._statement_list)
     ),
 
     type_case: $ => seq(
       'case',
-      commaSep1($._type)
+      commaSep1($._type),
+      ':'
     ),
 
     select_statement: $ => seq(
@@ -562,13 +565,13 @@ module.exports = grammar({
 
     communication_clause: $ => seq(
       choice($.communication_case, $.default_case),
-      ':',
       optional($._statement_list)
     ),
 
     communication_case: $ => seq(
       'case',
-      choice($.send_statement, $.receive_statement)
+      choice($.send_statement, $.receive_statement),
+      ':'
     ),
 
     _expression: $ => choice(

diff --git a/src/grammar.json b/src/grammar.json
@@ -2291,10 +2291,6 @@
             }
           ]
         },
-        {
-          "type": "STRING",
-          "value": ":"
-        },
         {
           "type": "CHOICE",
           "members": [
@@ -2319,12 +2315,25 @@
         {
           "type": "SYMBOL",
           "name": "expression_list"
+        },
+        {
+          "type": "STRING",
+          "value": ":"
         }
       ]
     },
     "default_case": {
-      "type": "STRING",
-      "value": "default"
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "STRING",
+          "value": "default"
+        },
+        {
+          "type": "STRING",
+          "value": ":"
+        }
+      ]
     },
     "type_switch_statement": {
       "type": "SEQ",
@@ -2437,10 +2446,6 @@
             }
           ]
         },
-        {
-          "type": "STRING",
-          "value": ":"
-        },
         {
           "type": "CHOICE",
           "members": [
@@ -2486,6 +2491,10 @@
               }
             }
           ]
+        },
+        {
+          "type": "STRING",
+          "value": ":"
         }
       ]
     },
@@ -2529,10 +2538,6 @@
             }
           ]
         },
-        {
-          "type": "STRING",
-          "value": ":"
-        },
         {
           "type": "CHOICE",
           "members": [
@@ -2566,6 +2571,10 @@
               "name": "receive_statement"
             }
           ]
+        },
+        {
+          "type": "STRING",
+          "value": ":"
         }
       ]
     },