Improved code for Schema, Rule and Mixin Statements

kcl-lang · Aug 11, 2024 · c5b6fd0 · c5b6fd0
1 parent 4585159
commit c5b6fd0
Show file tree

Hide file tree

Showing 5 changed files with 176,868 additions and 168,279 deletions.
diff --git a/grammar.js b/grammar.js
@@ -212,10 +212,10 @@ module.exports = grammar({
 
     // Simple statements
 
-    _simple_statements: $ => seq(
+    _simple_statements: $ => prec(24, seq(
       $._simple_statement,
       $._newline,
-    ),
+    )),
 
     _simple_statement: $ => choice(
       $.expression,
@@ -225,6 +225,7 @@ module.exports = grammar({
       $.import_statement,
       $.assert_statement,
       $.type_alias_statement,
+      $.mixin_statement,
     ),
 
     import_statement: $ => seq(
@@ -313,15 +314,28 @@ module.exports = grammar({
       )
     )),
 
-    rule_statement: $ => seq(
+    rule_statement: $ => prec.left(seq(
       'rule',
-      field('name', $.identifier),
+      field('name', $.parameter),
       optional(seq(
+        '(',
+        field('base', $.identifier),
+        ')'
+      )),
+      optional(seq( 
         'for',
-        field('protocol', $.identifier)
+        field('protocol', $.identifier),
       )),
       ':',
-      field('body', $._suite)
+      field('body', $._suite),
+    )),
+
+    parameter_list: $ => seq(
+      $.identifier,
+      repeat(seq(
+        ',',
+        $.identifier
+      ))
     ),
 
     elif_clause: $ => seq(
@@ -465,18 +479,22 @@ module.exports = grammar({
         field('base', $.identifier),
         ')'
       )),
+      optional(seq( 
+        'for',
+        field('protocol', $.identifier),
+      )),
       ':',
       field('body', $._suite),
     )),
 
     mixin_statement: $ => seq(
       'mixin',
-      field('name', $.identifier),
-      'for',
-      field('protocol', $.identifier),
-      ':',
-      field('body', $._suite),
-    ),
+      field('name', $.primary_expression),
+      optional(seq('for',
+        field('protocol', $.identifier),
+        ':',
+        field('body', $._suite),
+    ))),
 
     protocol_statement: $ => seq(
       'protocol',
@@ -541,6 +559,8 @@ module.exports = grammar({
     _suite: $ => choice(
       alias($._simple_statements, $.block),
       seq($._indent, $.block),
+      seq($.assignment, $._newline),
+      seq($.comparison_operator, $._newline),
       alias($._newline, $.block),
     ),
 
@@ -648,7 +668,7 @@ module.exports = grammar({
 
     not_operator: $ => prec(PREC.not, seq(
       'not',
-      field('argument', $.expression),
+      field('argument', $.primary_expression),
     )),
 
     boolean_operator: $ => choice(

diff --git a/src/grammar.json b/src/grammar.json
@@ -23,17 +23,21 @@
       ]
     },
     "_simple_statements": {
-      "type": "SEQ",
-      "members": [
-        {
-          "type": "SYMBOL",
-          "name": "_simple_statement"
-        },
-        {
-          "type": "SYMBOL",
-          "name": "_newline"
-        }
-      ]
+      "type": "PREC",
+      "value": 24,
+      "content": {
+        "type": "SEQ",
+        "members": [
+          {
+            "type": "SYMBOL",
+            "name": "_simple_statement"
+          },
+          {
+            "type": "SYMBOL",
+            "name": "_newline"
+          }
+        ]
+      }
     },
     "_simple_statement": {
       "type": "CHOICE",
@@ -65,6 +69,10 @@
         {
           "type": "SYMBOL",
           "name": "type_alias_statement"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "mixin_statement"
         }
       ]
     },
@@ -560,6 +568,31 @@
         }
       ]
     },
+    "parameter_list": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "SYMBOL",
+          "name": "identifier"
+        },
+        {
+          "type": "REPEAT",
+          "content": {
+            "type": "SEQ",
+            "members": [
+              {
+                "type": "STRING",
+                "value": ","
+              },
+              {
+                "type": "SYMBOL",
+                "name": "identifier"
+              }
+            ]
+          }
+        }
+      ]
+    },
     "elif_clause": {
       "type": "SEQ",
       "members": [
@@ -1197,6 +1230,31 @@
               }
             ]
           },
+          {
+            "type": "CHOICE",
+            "members": [
+              {
+                "type": "SEQ",
+                "members": [
+                  {
+                    "type": "STRING",
+                    "value": "for"
+                  },
+                  {
+                    "type": "FIELD",
+                    "name": "protocol",
+                    "content": {
+                      "type": "SYMBOL",
+                      "name": "identifier"
+                    }
+                  }
+                ]
+              },
+              {
+                "type": "BLANK"
+              }
+            ]
+          },
           {
             "type": "STRING",
             "value": ":"
@@ -1224,32 +1282,45 @@
           "name": "name",
           "content": {
             "type": "SYMBOL",
-            "name": "identifier"
-          }
-        },
-        {
-          "type": "STRING",
-          "value": "for"
-        },
-        {
-          "type": "FIELD",
-          "name": "protocol",
-          "content": {
-            "type": "SYMBOL",
-            "name": "identifier"
+            "name": "primary_expression"
           }
         },
         {
-          "type": "STRING",
-          "value": ":"
-        },
-        {
-          "type": "FIELD",
-          "name": "body",
-          "content": {
-            "type": "SYMBOL",
-            "name": "_suite"
-          }
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "SEQ",
+              "members": [
+                {
+                  "type": "STRING",
+                  "value": "for"
+                },
+                {
+                  "type": "FIELD",
+                  "name": "protocol",
+                  "content": {
+                    "type": "SYMBOL",
+                    "name": "identifier"
+                  }
+                },
+                {
+                  "type": "STRING",
+                  "value": ":"
+                },
+                {
+                  "type": "FIELD",
+                  "name": "body",
+                  "content": {
+                    "type": "SYMBOL",
+                    "name": "_suite"
+                  }
+                }
+              ]
+            },
+            {
+              "type": "BLANK"
+            }
+          ]
         }
       ]
     },
@@ -1503,6 +1574,32 @@
             }
           ]
         },
+        {
+          "type": "SEQ",
+          "members": [
+            {
+              "type": "SYMBOL",
+              "name": "assignment"
+            },
+            {
+              "type": "SYMBOL",
+              "name": "_newline"
+            }
+          ]
+        },
+        {
+          "type": "SEQ",
+          "members": [
+            {
+              "type": "SYMBOL",
+              "name": "comparison_operator"
+            },
+            {
+              "type": "SYMBOL",
+              "name": "_newline"
+            }
+          ]
+        },
         {
           "type": "ALIAS",
           "content": {
@@ -1969,7 +2066,7 @@
             "name": "argument",
             "content": {
               "type": "SYMBOL",
-              "name": "expression"
+              "name": "primary_expression"
             }
           }
         ]