Apply hack

tree-sitter · Dec 4, 2021 · d253bb8 · d253bb8
1 parent 2e38411
commit d253bb8
Show file tree

Hide file tree

Showing 5 changed files with 48,028 additions and 28,058 deletions.
diff --git a/grammar.js b/grammar.js
@@ -39,6 +39,8 @@ module.exports = grammar({
     [$.list, $.list_pattern],
     [$.with_item, $._collection_elements],
     [$.named_expression, $.as_pattern],
+    [$.primary_expression, $.concatenated_string],
+    [$.concatenated_string],
   ],
 
   supertypes: $ => [
@@ -75,6 +77,7 @@ module.exports = grammar({
 
     _statement: $ => choice(
       $._simple_statements,
+      $._maybe_match_statement,
       $._compound_statement
     ),
 
@@ -223,14 +226,13 @@ module.exports = grammar({
 
     _compound_statement: $ => choice(
       $.if_statement,
-      $.match_statement,
       $.for_statement,
       $.while_statement,
       $.try_statement,
       $.with_statement,
       $.function_definition,
       $.class_definition,
-      $.decorated_definition
+      $.decorated_definition,
     ),
 
     if_statement: $ => seq(
@@ -255,12 +257,16 @@ module.exports = grammar({
       field('body', $._suite)
     ),
 
-    match_statement: $ => seq(
-      'match',
-      field('subject', $.expression),
-      ':',
-      repeat(field('alternative', $.case_clause)),
-    ),
+    _maybe_match_statement: $ => seq(
+      choice($.match_statement,
+        alias(seq(alias("match", $.identifier),
+          choice(
+            seq('=', field('right', $._right_hand_side)),
+            seq(':', field('type', $.type)),
+            seq(':', field('type', $.type), '=', field('right', $._right_hand_side))
+          )), $.assignment))),
+
+    match_statement: $ => seq('match', field('subject', $.expression), ':', repeat(field('alternative', $.case_clause))),
 
     case_clause: $ => seq(
       'case',
@@ -652,8 +658,8 @@ module.exports = grammar({
             'is',
             seq('is', 'not')
           )),
-          $.primary_expression
-        ))
+        $.primary_expression
+      ))
     )),
 
     lambda: $ => prec(PREC.lambda, seq(
@@ -990,10 +996,10 @@ module.exports = grammar({
   }
 })
 
-function commaSep1 (rule) {
+function commaSep1(rule) {
   return sep1(rule, ',')
 }
 
-function sep1 (rule, separator) {
+function sep1(rule, separator) {
   return seq(rule, repeat(seq(separator, rule)))
 }
diff --git a/src/grammar.json b/src/grammar.json
@@ -16,6 +16,10 @@
           "type": "SYMBOL",
           "name": "_simple_statements"
         },
+        {
+          "type": "SYMBOL",
+          "name": "_maybe_match_statement"
+        },
         {
           "type": "SYMBOL",
           "name": "_compound_statement"
@@ -745,10 +749,6 @@
           "type": "SYMBOL",
           "name": "if_statement"
         },
-        {
-          "type": "SYMBOL",
-          "name": "match_statement"
-        },
         {
           "type": "SYMBOL",
           "name": "for_statement"
@@ -885,6 +885,102 @@
         }
       ]
     },
+    "_maybe_match_statement": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "SYMBOL",
+              "name": "match_statement"
+            },
+            {
+              "type": "ALIAS",
+              "content": {
+                "type": "SEQ",
+                "members": [
+                  {
+                    "type": "SYMBOL",
+                    "name": "identifier"
+                  },
+                  {
+                    "type": "CHOICE",
+                    "members": [
+                      {
+                        "type": "SEQ",
+                        "members": [
+                          {
+                            "type": "STRING",
+                            "value": "="
+                          },
+                          {
+                            "type": "FIELD",
+                            "name": "right",
+                            "content": {
+                              "type": "SYMBOL",
+                              "name": "_right_hand_side"
+                            }
+                          }
+                        ]
+                      },
+                      {
+                        "type": "SEQ",
+                        "members": [
+                          {
+                            "type": "STRING",
+                            "value": ":"
+                          },
+                          {
+                            "type": "FIELD",
+                            "name": "type",
+                            "content": {
+                              "type": "SYMBOL",
+                              "name": "type"
+                            }
+                          }
+                        ]
+                      },
+                      {
+                        "type": "SEQ",
+                        "members": [
+                          {
+                            "type": "STRING",
+                            "value": ":"
+                          },
+                          {
+                            "type": "FIELD",
+                            "name": "type",
+                            "content": {
+                              "type": "SYMBOL",
+                              "name": "type"
+                            }
+                          },
+                          {
+                            "type": "STRING",
+                            "value": "="
+                          },
+                          {
+                            "type": "FIELD",
+                            "name": "right",
+                            "content": {
+                              "type": "SYMBOL",
+                              "name": "_right_hand_side"
+                            }
+                          }
+                        ]
+                      }
+                    ]
+                  }
+                ]
+              },
+              "named": true,
+              "value": "assignment"
+            }
+          ]
+        }
+      ]
+    },
     "match_statement": {
       "type": "SEQ",
       "members": [
@@ -4983,6 +5079,13 @@
     [
       "named_expression",
       "as_pattern"
+    ],
+    [
+      "primary_expression",
+      "concatenated_string"
+    ],
+    [
+      "concatenated_string"
     ]
   ],
   "precedences": [],

diff --git a/src/node-types.json b/src/node-types.json
@@ -23,10 +23,6 @@
         "type": "if_statement",
         "named": true
       },
-      {
-        "type": "match_statement",
-        "named": true
-      },
       {
         "type": "try_statement",
         "named": true
@@ -698,6 +694,18 @@
         {
           "type": "_simple_statement",
           "named": true
+        },
+        {
+          "type": "assignment",
+          "named": true
+        },
+        {
+          "type": "augmented_assignment",
+          "named": true
+        },
+        {
+          "type": "match_statement",
+          "named": true
         }
       ]
     }
@@ -1881,6 +1889,18 @@
         {
           "type": "_simple_statement",
           "named": true
+        },
+        {
+          "type": "assignment",
+          "named": true
+        },
+        {
+          "type": "augmented_assignment",
+          "named": true
+        },
+        {
+          "type": "match_statement",
+          "named": true
         }
       ]
     }