Merge pull request #176 from yoff/patch-1

Update grammar to accept `except*`
tree-sitter · Oct 24, 2022 · b14614e · b14614e
2 parents de221ec + 87c3f4c
commit b14614e
Show file tree

Hide file tree

Showing 5 changed files with 52,969 additions and 45,563 deletions.
diff --git a/grammar.js b/grammar.js
@@ -324,6 +324,11 @@ module.exports = grammar({
           optional($.else_clause),
           optional($.finally_clause)
         ),
+        seq(
+          repeat1($.except_group_clause),
+          optional($.else_clause),
+          optional($.finally_clause)
+        ),
         $.finally_clause
       )
     ),
@@ -341,7 +346,20 @@ module.exports = grammar({
       $._suite
     ),
 
-    finally_clause: $ => seq(
+   except_group_clause: $ => seq(
+      'except*',
+      seq(
+        $.expression,
+        optional(seq(
+          'as',
+          $.expression
+        ))
+      ),
+      ':',
+      $._suite
+    ),
+
+   finally_clause: $ => seq(
       'finally',
       ':',
       $._suite

diff --git a/src/grammar.json b/src/grammar.json
@@ -1254,6 +1254,42 @@
                 }
               ]
             },
+            {
+              "type": "SEQ",
+              "members": [
+                {
+                  "type": "REPEAT1",
+                  "content": {
+                    "type": "SYMBOL",
+                    "name": "except_group_clause"
+                  }
+                },
+                {
+                  "type": "CHOICE",
+                  "members": [
+                    {
+                      "type": "SYMBOL",
+                      "name": "else_clause"
+                    },
+                    {
+                      "type": "BLANK"
+                    }
+                  ]
+                },
+                {
+                  "type": "CHOICE",
+                  "members": [
+                    {
+                      "type": "SYMBOL",
+                      "name": "finally_clause"
+                    },
+                    {
+                      "type": "BLANK"
+                    }
+                  ]
+                }
+              ]
+            },
             {
               "type": "SYMBOL",
               "name": "finally_clause"
@@ -1326,6 +1362,53 @@
         }
       ]
     },
+    "except_group_clause": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "STRING",
+          "value": "except*"
+        },
+        {
+          "type": "SEQ",
+          "members": [
+            {
+              "type": "SYMBOL",
+              "name": "expression"
+            },
+            {
+              "type": "CHOICE",
+              "members": [
+                {
+                  "type": "SEQ",
+                  "members": [
+                    {
+                      "type": "STRING",
+                      "value": "as"
+                    },
+                    {
+                      "type": "SYMBOL",
+                      "name": "expression"
+                    }
+                  ]
+                },
+                {
+                  "type": "BLANK"
+                }
+              ]
+            }
+          ]
+        },
+        {
+          "type": "STRING",
+          "value": ":"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "_suite"
+        }
+      ]
+    },
     "finally_clause": {
       "type": "SEQ",
       "members": [

diff --git a/src/node-types.json b/src/node-types.json
@@ -1256,6 +1256,25 @@
       ]
     }
   },
+  {
+    "type": "except_group_clause",
+    "named": true,
+    "fields": {},
+    "children": {
+      "multiple": true,
+      "required": true,
+      "types": [
+        {
+          "type": "block",
+          "named": true
+        },
+        {
+          "type": "expression",
+          "named": true
+        }
+      ]
+    }
+  },
   {
     "type": "exec_statement",
     "named": true,
@@ -2353,6 +2372,10 @@
           "type": "except_clause",
           "named": true
         },
+        {
+          "type": "except_group_clause",
+          "named": true
+        },
         {
           "type": "finally_clause",
           "named": true
@@ -2882,6 +2905,10 @@
     "type": "except",
     "named": false
   },
+  {
+    "type": "except*",
+    "named": false
+  },
   {
     "type": "exec",
     "named": false