feat: add full grammar

Signed-off-by: peefy <[email protected]>
kcl-lang · Jan 9, 2024 · c20a68e · c20a68e
1 parent 17fb6e1
commit c20a68e
Show file tree

Hide file tree

Showing 9 changed files with 13,356 additions and 13,240 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        os: [macos-latest, ubuntu-latest]
+        os: [ubuntu-latest]
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3

diff --git a/grammar.js b/grammar.js
@@ -195,7 +195,10 @@ module.exports = grammar({
     ),
 
     _simple_statement: $ => choice(
-      $.expression_statement,
+      $.expression,
+      $.assignment,
+      $.augmented_assignment,
+      $.unification,
       $.import_statement,
       $.assert_statement,
       $.type_alias_statement,
@@ -229,13 +232,6 @@ module.exports = grammar({
       optional(seq(',', $.expression))
     ),
 
-    expression_statement: $ => choice(
-      $.expression,
-      $.assignment,
-      $.augmented_assignment,
-      $.unification,
-    ),
-
     // Compound statements
 
     _compound_statement: $ => choice(
@@ -705,7 +701,7 @@ module.exports = grammar({
       ),
       seq(
         repeat1(/[0-9]+_?/),
-        //optional($.multiplier),
+        field('multiplier', optional(choice('n', 'u', 'm', 'k', 'K', 'M', 'G', 'T', 'P', 'Ki', 'Mi', 'Gi', 'Ti', 'Pi'))),
       ),
     )),
 

diff --git a/src/grammar.json b/src/grammar.json
@@ -40,7 +40,19 @@
       "members": [
         {
           "type": "SYMBOL",
-          "name": "expression_statement"
+          "name": "expression"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "assignment"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "augmented_assignment"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "unification"
         },
         {
           "type": "SYMBOL",
@@ -190,27 +202,6 @@
         }
       ]
     },
-    "expression_statement": {
-      "type": "CHOICE",
-      "members": [
-        {
-          "type": "SYMBOL",
-          "name": "expression"
-        },
-        {
-          "type": "SYMBOL",
-          "name": "assignment"
-        },
-        {
-          "type": "SYMBOL",
-          "name": "augmented_assignment"
-        },
-        {
-          "type": "SYMBOL",
-          "name": "unification"
-        }
-      ]
-    },
     "_compound_statement": {
       "type": "CHOICE",
       "members": [
@@ -2892,6 +2883,79 @@
                   "type": "PATTERN",
                   "value": "[0-9]+_?"
                 }
+              },
+              {
+                "type": "FIELD",
+                "name": "multiplier",
+                "content": {
+                  "type": "CHOICE",
+                  "members": [
+                    {
+                      "type": "CHOICE",
+                      "members": [
+                        {
+                          "type": "STRING",
+                          "value": "n"
+                        },
+                        {
+                          "type": "STRING",
+                          "value": "u"
+                        },
+                        {
+                          "type": "STRING",
+                          "value": "m"
+                        },
+                        {
+                          "type": "STRING",
+                          "value": "k"
+                        },
+                        {
+                          "type": "STRING",
+                          "value": "K"
+                        },
+                        {
+                          "type": "STRING",
+                          "value": "M"
+                        },
+                        {
+                          "type": "STRING",
+                          "value": "G"
+                        },
+                        {
+                          "type": "STRING",
+                          "value": "T"
+                        },
+                        {
+                          "type": "STRING",
+                          "value": "P"
+                        },
+                        {
+                          "type": "STRING",
+                          "value": "Ki"
+                        },
+                        {
+                          "type": "STRING",
+                          "value": "Mi"
+                        },
+                        {
+                          "type": "STRING",
+                          "value": "Gi"
+                        },
+                        {
+                          "type": "STRING",
+                          "value": "Ti"
+                        },
+                        {
+                          "type": "STRING",
+                          "value": "Pi"
+                        }
+                      ]
+                    },
+                    {
+                      "type": "BLANK"
+                    }
+                  ]
+                }
               }
             ]
           }

diff --git a/src/node-types.json b/src/node-types.json
@@ -30,7 +30,15 @@
         "named": true
       },
       {
-        "type": "expression_statement",
+        "type": "assignment",
+        "named": true
+      },
+      {
+        "type": "augmented_assignment",
+        "named": true
+      },
+      {
+        "type": "expression",
         "named": true
       },
       {
@@ -40,6 +48,10 @@
       {
         "type": "type_alias_statement",
         "named": true
+      },
+      {
+        "type": "unification",
+        "named": true
       }
     ]
   },
@@ -863,33 +875,6 @@
       }
     }
   },
-  {
-    "type": "expression_statement",
-    "named": true,
-    "fields": {},
-    "children": {
-      "multiple": false,
-      "required": true,
-      "types": [
-        {
-          "type": "assignment",
-          "named": true
-        },
-        {
-          "type": "augmented_assignment",
-          "named": true
-        },
-        {
-          "type": "expression",
-          "named": true
-        },
-        {
-          "type": "unification",
-          "named": true
-        }
-      ]
-    }
-  },
   {
     "type": "for_in_clause",
     "named": true,