Cleanup begin

tree-sitter · Jul 23, 2022 · 76b00c5 · 76b00c5
1 parent ec7fdab
commit 76b00c5
Show file tree

Hide file tree

Showing 3 changed files with 299,301 additions and 299,640 deletions.
diff --git a/grammar.js b/grammar.js
@@ -270,11 +270,6 @@ module.exports = grammar({
       'end'
     ),
 
-    body_statement: $ => choice(
-      seq($._statements, repeat(choice($.rescue, $.else, $.ensure))),
-      seq(optional($._statements), repeat1(choice($.rescue, $.else, $.ensure))),
-    ),
-
     superclass: $ => seq('<', $._expression),
 
     singleton_class: $ => seq(
@@ -601,7 +596,7 @@ module.exports = grammar({
       )
     ),
 
-    begin: $ => seq('begin', optional($._terminator), $._body_statement),
+    begin: $ => seq('begin', optional($._terminator), optional($._body_statement), 'end'),
 
     ensure: $ => seq('ensure', optional($._statements)),
 
@@ -619,10 +614,11 @@ module.exports = grammar({
 
     exception_variable: $ => seq('=>', $._lhs),
 
-    _body_statement: $ => seq(
-      optional($._statements),
-      repeat(choice($.rescue, $.else, $.ensure)),
-      'end'
+    body_statement: $ => $._body_statement,
+
+    _body_statement: $ => choice(
+      seq($._statements, repeat(choice($.rescue, $.else, $.ensure))),
+      seq(optional($._statements), repeat1(choice($.rescue, $.else, $.ensure))),
     ),
 
     // Method calls without parentheses (aka "command calls") are only allowed

diff --git a/src/grammar.json b/src/grammar.json
@@ -971,77 +971,6 @@
         }
       ]
     },
-    "body_statement": {
-      "type": "CHOICE",
-      "members": [
-        {
-          "type": "SEQ",
-          "members": [
-            {
-              "type": "SYMBOL",
-              "name": "_statements"
-            },
-            {
-              "type": "REPEAT",
-              "content": {
-                "type": "CHOICE",
-                "members": [
-                  {
-                    "type": "SYMBOL",
-                    "name": "rescue"
-                  },
-                  {
-                    "type": "SYMBOL",
-                    "name": "else"
-                  },
-                  {
-                    "type": "SYMBOL",
-                    "name": "ensure"
-                  }
-                ]
-              }
-            }
-          ]
-        },
-        {
-          "type": "SEQ",
-          "members": [
-            {
-              "type": "CHOICE",
-              "members": [
-                {
-                  "type": "SYMBOL",
-                  "name": "_statements"
-                },
-                {
-                  "type": "BLANK"
-                }
-              ]
-            },
-            {
-              "type": "REPEAT1",
-              "content": {
-                "type": "CHOICE",
-                "members": [
-                  {
-                    "type": "SYMBOL",
-                    "name": "rescue"
-                  },
-                  {
-                    "type": "SYMBOL",
-                    "name": "else"
-                  },
-                  {
-                    "type": "SYMBOL",
-                    "name": "ensure"
-                  }
-                ]
-              }
-            }
-          ]
-        }
-      ]
-    },
     "superclass": {
       "type": "SEQ",
       "members": [
@@ -3334,8 +3263,20 @@
           ]
         },
         {
-          "type": "SYMBOL",
-          "name": "_body_statement"
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "SYMBOL",
+              "name": "_body_statement"
+            },
+            {
+              "type": "BLANK"
+            }
+          ]
+        },
+        {
+          "type": "STRING",
+          "value": "end"
         }
       ]
     },
@@ -3474,44 +3415,78 @@
         }
       ]
     },
+    "body_statement": {
+      "type": "SYMBOL",
+      "name": "_body_statement"
+    },
     "_body_statement": {
-      "type": "SEQ",
+      "type": "CHOICE",
       "members": [
         {
-          "type": "CHOICE",
+          "type": "SEQ",
           "members": [
             {
               "type": "SYMBOL",
               "name": "_statements"
             },
             {
-              "type": "BLANK"
+              "type": "REPEAT",
+              "content": {
+                "type": "CHOICE",
+                "members": [
+                  {
+                    "type": "SYMBOL",
+                    "name": "rescue"
+                  },
+                  {
+                    "type": "SYMBOL",
+                    "name": "else"
+                  },
+                  {
+                    "type": "SYMBOL",
+                    "name": "ensure"
+                  }
+                ]
+              }
             }
           ]
         },
         {
-          "type": "REPEAT",
-          "content": {
-            "type": "CHOICE",
-            "members": [
-              {
-                "type": "SYMBOL",
-                "name": "rescue"
-              },
-              {
-                "type": "SYMBOL",
-                "name": "else"
-              },
-              {
-                "type": "SYMBOL",
-                "name": "ensure"
+          "type": "SEQ",
+          "members": [
+            {
+              "type": "CHOICE",
+              "members": [
+                {
+                  "type": "SYMBOL",
+                  "name": "_statements"
+                },
+                {
+                  "type": "BLANK"
+                }
+              ]
+            },
+            {
+              "type": "REPEAT1",
+              "content": {
+                "type": "CHOICE",
+                "members": [
+                  {
+                    "type": "SYMBOL",
+                    "name": "rescue"
+                  },
+                  {
+                    "type": "SYMBOL",
+                    "name": "else"
+                  },
+                  {
+                    "type": "SYMBOL",
+                    "name": "ensure"
+                  }
+                ]
               }
-            ]
-          }
-        },
-        {
-          "type": "STRING",
-          "value": "end"
+            }
+          ]
         }
       ]
     },