add old match pattern syntax

It is still supported and used in the Fennel compiler
TravonteD · Aug 29, 2021 · f57cc57 · f57cc57
1 parent 9ab6464
commit f57cc57
Show file tree

Hide file tree

Showing 5 changed files with 7,507 additions and 6,238 deletions.
diff --git a/grammar.js b/grammar.js
@@ -275,13 +275,22 @@ module.exports = grammar({
     _pattern: $ => choice(
       $._simple_pattern,
       $.where_pattern,
+      $.guard_pattern,
     ),
 
     _simple_pattern: $ => choice(
       $.multi_value_pattern,
       $._non_multi_value_pattern,
     ),
 
+    guard_pattern: $ => seq(
+      '(',
+      $._simple_pattern,
+      '?',
+      field('guard', repeat1($._sexp)),
+      ')',
+    ),
+
     where_pattern: $ => seq(
       '(',
       'where',
@@ -294,7 +303,7 @@ module.exports = grammar({
           ')',
         ),
       ),
-      optional($._sexp),
+      field('guard', repeat($._sexp)),
       ')',
     ),
 

diff --git a/src/grammar.json b/src/grammar.json
@@ -888,6 +888,10 @@
         {
           "type": "SYMBOL",
           "name": "where_pattern"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "guard_pattern"
         }
       ]
     },
@@ -904,6 +908,38 @@
         }
       ]
     },
+    "guard_pattern": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "STRING",
+          "value": "("
+        },
+        {
+          "type": "SYMBOL",
+          "name": "_simple_pattern"
+        },
+        {
+          "type": "STRING",
+          "value": "?"
+        },
+        {
+          "type": "FIELD",
+          "name": "guard",
+          "content": {
+            "type": "REPEAT1",
+            "content": {
+              "type": "SYMBOL",
+              "name": "_sexp"
+            }
+          }
+        },
+        {
+          "type": "STRING",
+          "value": ")"
+        }
+      ]
+    },
     "where_pattern": {
       "type": "SEQ",
       "members": [
@@ -949,16 +985,15 @@
           ]
         },
         {
-          "type": "CHOICE",
-          "members": [
-            {
+          "type": "FIELD",
+          "name": "guard",
+          "content": {
+            "type": "REPEAT",
+            "content": {
               "type": "SYMBOL",
               "name": "_sexp"
-            },
-            {
-              "type": "BLANK"
             }
-          ]
+          }
         },
         {
           "type": "STRING",