feat: support for expression

moonbitlang · Apr 1, 2024 · 12962c1 · 12962c1
1 parent b034ab9
commit 12962c1
Show file tree

Hide file tree

Showing 5 changed files with 331 additions and 0 deletions.
diff --git a/grammar.js b/grammar.js
@@ -590,6 +590,24 @@ module.exports = grammar({
       '}',
     ),
 
+    for_binder: $ => seq(
+      $.lowercase_identifier,
+      '=',
+      $.expression
+    ),
+
+    for_expression: $ => seq(
+      'for',
+      commaStrictList($.for_binder),
+      optional(seq(
+        ';',
+        optional($.simple_expression),
+        ';',
+        commaStrictList($.for_binder)
+      )),
+      $.block_expression
+    ),
+
     return_expression: $ => seq('return', optional($.expression)),
 
     // Patterns
@@ -799,6 +817,28 @@ function commaList1(rule) {
   );
 }
 
+
+/**
+ * @param {Rule} rule
+ *
+ * @return {ChoiceRule}
+ */
+function commaStrictList(rule) {
+  return optional(commaStrictList1(rule))
+}
+
+/**
+ * @param {Rule} rule
+ *
+ * @return {SeqRule}
+ */
+function commaStrictList1(rule) {
+  return seq(
+    rule,
+    repeat(seq(',', rule)),
+  );
+}
+
 /**
  *
  * @param {Rule} rule

diff --git a/src/grammar.json b/src/grammar.json
@@ -3652,6 +3652,135 @@
         }
       ]
     },
+    "for_binder": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "SYMBOL",
+          "name": "lowercase_identifier"
+        },
+        {
+          "type": "STRING",
+          "value": "="
+        },
+        {
+          "type": "SYMBOL",
+          "name": "expression"
+        }
+      ]
+    },
+    "for_expression": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "STRING",
+          "value": "for"
+        },
+        {
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "SEQ",
+              "members": [
+                {
+                  "type": "SYMBOL",
+                  "name": "for_binder"
+                },
+                {
+                  "type": "REPEAT",
+                  "content": {
+                    "type": "SEQ",
+                    "members": [
+                      {
+                        "type": "STRING",
+                        "value": ","
+                      },
+                      {
+                        "type": "SYMBOL",
+                        "name": "for_binder"
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
+            {
+              "type": "BLANK"
+            }
+          ]
+        },
+        {
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "SEQ",
+              "members": [
+                {
+                  "type": "STRING",
+                  "value": ";"
+                },
+                {
+                  "type": "CHOICE",
+                  "members": [
+                    {
+                      "type": "SYMBOL",
+                      "name": "simple_expression"
+                    },
+                    {
+                      "type": "BLANK"
+                    }
+                  ]
+                },
+                {
+                  "type": "STRING",
+                  "value": ";"
+                },
+                {
+                  "type": "CHOICE",
+                  "members": [
+                    {
+                      "type": "SEQ",
+                      "members": [
+                        {
+                          "type": "SYMBOL",
+                          "name": "for_binder"
+                        },
+                        {
+                          "type": "REPEAT",
+                          "content": {
+                            "type": "SEQ",
+                            "members": [
+                              {
+                                "type": "STRING",
+                                "value": ","
+                              },
+                              {
+                                "type": "SYMBOL",
+                                "name": "for_binder"
+                              }
+                            ]
+                          }
+                        }
+                      ]
+                    },
+                    {
+                      "type": "BLANK"
+                    }
+                  ]
+                }
+              ]
+            },
+            {
+              "type": "BLANK"
+            }
+          ]
+        },
+        {
+          "type": "SYMBOL",
+          "name": "block_expression"
+        }
+      ]
+    },
     "return_expression": {
       "type": "SEQ",
       "members": [

diff --git a/src/node-types.json b/src/node-types.json
@@ -691,6 +691,25 @@
       ]
     }
   },
+  {
+    "type": "for_binder",
+    "named": true,
+    "fields": {},
+    "children": {
+      "multiple": true,
+      "required": true,
+      "types": [
+        {
+          "type": "expression",
+          "named": true
+        },
+        {
+          "type": "lowercase_identifier",
+          "named": true
+        }
+      ]
+    }
+  },
   {
     "type": "function_definition",
     "named": true,
@@ -2433,6 +2452,10 @@
     "type": "fn",
     "named": false
   },
+  {
+    "type": "for",
+    "named": false
+  },
   {
     "type": "if",
     "named": false

diff --git a/src/parser.c b/src/parser.c
diff --git a/test/corpus/for.txt b/test/corpus/for.txt
@@ -0,0 +1,139 @@
+================================================================================
+for
+================================================================================
+fn init {
+  for i = 0; i < 10; i = i + 1 {
+  }
+}
+--------------------------------------------------------------------------------
+
+(structure
+  (structure_item
+    (function_definition
+      (function_identifier
+        (lowercase_identifier))
+      (block_expression
+        (statement_expression
+          (assign_expression
+            (left_value
+              (qualified_identifier
+                (lowercase_identifier)))
+            (ERROR
+              (lowercase_identifier))
+            (expression
+              (simple_expression
+                (atomic_expression
+                  (literal
+                    (integer_literal)))))))
+        (statement_expression
+          (expression
+            (simple_expression
+              (binary_expression
+                (expression
+                  (simple_expression
+                    (qualified_identifier
+                      (lowercase_identifier))))
+                (expression
+                  (simple_expression
+                    (atomic_expression
+                      (literal
+                        (integer_literal)))))))))
+        (statement_expression
+          (assign_expression
+            (left_value
+              (qualified_identifier
+                (lowercase_identifier)))
+            (expression
+              (simple_expression
+                (binary_expression
+                  (expression
+                    (simple_expression
+                      (qualified_identifier
+                        (lowercase_identifier))))
+                  (ERROR
+                    (simple_expression
+                      (atomic_expression
+                        (literal
+                          (integer_literal)))))
+                  (expression
+                    (simple_expression
+                      (struct_expression
+                        (struct_brace_expression)))))))))))))
+
+================================================================================
+forever
+================================================================================
+fn init {
+  for i = 0; i < 10; {
+  }
+}
+--------------------------------------------------------------------------------
+
+(structure
+  (structure_item
+    (function_definition
+      (function_identifier
+        (lowercase_identifier))
+      (block_expression
+        (statement_expression
+          (assign_expression
+            (left_value
+              (qualified_identifier
+                (lowercase_identifier)))
+            (ERROR
+              (lowercase_identifier))
+            (expression
+              (simple_expression
+                (atomic_expression
+                  (literal
+                    (integer_literal)))))))
+        (statement_expression
+          (expression
+            (simple_expression
+              (binary_expression
+                (expression
+                  (simple_expression
+                    (qualified_identifier
+                      (lowercase_identifier))))
+                (expression
+                  (simple_expression
+                    (atomic_expression
+                      (literal
+                        (integer_literal)))))))))
+        (statement_expression
+          (expression
+            (simple_expression
+              (struct_expression
+                (struct_brace_expression)))))))))
+
+================================================================================
+simple for
+================================================================================
+fn init {
+  for i = 0 {
+  }
+}
+--------------------------------------------------------------------------------
+
+(structure
+  (structure_item
+    (function_definition
+      (function_identifier
+        (lowercase_identifier))
+      (block_expression
+        (statement_expression
+          (assign_expression
+            (left_value
+              (qualified_identifier
+                (lowercase_identifier)))
+            (ERROR
+              (lowercase_identifier))
+            (ERROR
+              (simple_expression
+                (atomic_expression
+                  (literal
+                    (integer_literal)))))
+            (expression
+              (simple_expression
+                (struct_expression
+                  (struct_brace_expression))))))))))