Merge pull request #51 from jneem/let-blocks

Support let blocks
nickel-lang · Aug 15, 2024 · 48cb1fc · 48cb1fc
2 parents 5e29fda + 267cd8c
commit 48cb1fc
Show file tree

Hide file tree

Showing 16 changed files with 20,344 additions and 19,751 deletions.
diff --git a/grammar.js b/grammar.js
@@ -120,13 +120,17 @@ module.exports = grammar({
       field("t2", $.term),
     ),
 
-    let_in_block: $ => seq(
-      "let",
-      optional("rec"),
+    let_binding: $ => seq(
       field("pat", $.pattern),
       field("meta", optional($.annot)),
       "=",
       field("t1", $.term),
+    ),
+
+    let_in_block: $ => seq(
+      "let",
+      optional("rec"),
+      field("bindings", seq(commaSep($.let_binding), optional(","))),
       "in",
     ),
 

diff --git a/src/grammar.json b/src/grammar.json
@@ -270,25 +270,9 @@
         }
       ]
     },
-    "let_in_block": {
+    "let_binding": {
       "type": "SEQ",
       "members": [
-        {
-          "type": "STRING",
-          "value": "let"
-        },
-        {
-          "type": "CHOICE",
-          "members": [
-            {
-              "type": "STRING",
-              "value": "rec"
-            },
-            {
-              "type": "BLANK"
-            }
-          ]
-        },
         {
           "type": "FIELD",
           "name": "pat",
@@ -324,6 +308,81 @@
             "type": "SYMBOL",
             "name": "term"
           }
+        }
+      ]
+    },
+    "let_in_block": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "STRING",
+          "value": "let"
+        },
+        {
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "STRING",
+              "value": "rec"
+            },
+            {
+              "type": "BLANK"
+            }
+          ]
+        },
+        {
+          "type": "FIELD",
+          "name": "bindings",
+          "content": {
+            "type": "SEQ",
+            "members": [
+              {
+                "type": "CHOICE",
+                "members": [
+                  {
+                    "type": "SEQ",
+                    "members": [
+                      {
+                        "type": "SYMBOL",
+                        "name": "let_binding"
+                      },
+                      {
+                        "type": "REPEAT",
+                        "content": {
+                          "type": "SEQ",
+                          "members": [
+                            {
+                              "type": "STRING",
+                              "value": ","
+                            },
+                            {
+                              "type": "SYMBOL",
+                              "name": "let_binding"
+                            }
+                          ]
+                        }
+                      }
+                    ]
+                  },
+                  {
+                    "type": "BLANK"
+                  }
+                ]
+              },
+              {
+                "type": "CHOICE",
+                "members": [
+                  {
+                    "type": "STRING",
+                    "value": ","
+                  },
+                  {
+                    "type": "BLANK"
+                  }
+                ]
+              }
+            ]
+          }
         },
         {
           "type": "STRING",

diff --git a/src/node-types.json b/src/node-types.json
@@ -938,20 +938,30 @@
     }
   },
   {
-    "type": "let_expr",
+    "type": "let_binding",
     "named": true,
     "fields": {
-      "binding": {
+      "meta": {
+        "multiple": false,
+        "required": false,
+        "types": [
+          {
+            "type": "annot",
+            "named": true
+          }
+        ]
+      },
+      "pat": {
         "multiple": false,
         "required": true,
         "types": [
           {
-            "type": "let_in_block",
+            "type": "pattern",
             "named": true
           }
         ]
       },
-      "t2": {
+      "t1": {
         "multiple": false,
         "required": true,
         "types": [
@@ -964,35 +974,45 @@
     }
   },
   {
-    "type": "let_in_block",
+    "type": "let_expr",
     "named": true,
     "fields": {
-      "meta": {
+      "binding": {
         "multiple": false,
-        "required": false,
+        "required": true,
         "types": [
           {
-            "type": "annot",
+            "type": "let_in_block",
             "named": true
           }
         ]
       },
-      "pat": {
+      "t2": {
         "multiple": false,
         "required": true,
         "types": [
           {
-            "type": "pattern",
+            "type": "term",
             "named": true
           }
         ]
-      },
-      "t1": {
-        "multiple": false,
-        "required": true,
+      }
+    }
+  },
+  {
+    "type": "let_in_block",
+    "named": true,
+    "fields": {
+      "bindings": {
+        "multiple": true,
+        "required": false,
         "types": [
           {
-            "type": "term",
+            "type": ",",
+            "named": false
+          },
+          {
+            "type": "let_binding",
             "named": true
           }
         ]