Added Schema Kwargs

Signed-off-by: Vishal <[email protected]>
kcl-lang · Jul 23, 2024 · 10ed19e · 10ed19e
1 parent 173307c
commit 10ed19e
Show file tree

Hide file tree

Showing 5 changed files with 79,542 additions and 77,713 deletions.
diff --git a/grammar.js b/grammar.js
@@ -311,6 +311,11 @@ module.exports = grammar({
       $.dict_expr,
     ),
 
+    schema_instantiation: $ => seq(
+      field('constructor', $.call),
+      field('initialization', $.dictionary)
+    ),
+
     schema_index_signature: $ => seq(
       '[',
       optional(seq(
@@ -576,6 +581,7 @@ module.exports = grammar({
       $.lambda_expr,
       $.quant_expr,
       $.schema_expr,
+      $.schema_instantiation,
       $.paren_expression,
       $.braces_expression,
       $.optional_attribute,
@@ -761,7 +767,7 @@ module.exports = grammar({
     assignment: $ => seq(
       field('left', $.dotted_name),
       choice(
-        seq('=', field('right', choice($.dotted_name,$.expression, $.selector_expression))),
+        seq('=', field('right', choice($.dotted_name,$.expression, $.selector_expression, $.schema_instantiation))),
         seq(':', field('type', $.type), '=', field('right', $.expression)),
         alias(seq(':',field('type', $.type)),'null_assignment'),
       ),

diff --git a/src/grammar.json b/src/grammar.json
@@ -454,6 +454,27 @@
         }
       ]
     },
+    "schema_instantiation": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "FIELD",
+          "name": "constructor",
+          "content": {
+            "type": "SYMBOL",
+            "name": "call"
+          }
+        },
+        {
+          "type": "FIELD",
+          "name": "initialization",
+          "content": {
+            "type": "SYMBOL",
+            "name": "dictionary"
+          }
+        }
+      ]
+    },
     "schema_index_signature": {
       "type": "SEQ",
       "members": [
@@ -1650,6 +1671,10 @@
             "type": "SYMBOL",
             "name": "schema_expr"
           },
+          {
+            "type": "SYMBOL",
+            "name": "schema_instantiation"
+          },
           {
             "type": "SYMBOL",
             "name": "paren_expression"
@@ -2893,6 +2918,10 @@
                       {
                         "type": "SYMBOL",
                         "name": "selector_expression"
+                      },
+                      {
+                        "type": "SYMBOL",
+                        "name": "schema_instantiation"
                       }
                     ]
                   }

diff --git a/src/node-types.json b/src/node-types.json
@@ -227,6 +227,10 @@
         "type": "schema_expr",
         "named": true
       },
+      {
+        "type": "schema_instantiation",
+        "named": true
+      },
       {
         "type": "select_suffix",
         "named": true
@@ -372,6 +376,10 @@
           {
             "type": "expression",
             "named": true
+          },
+          {
+            "type": "schema_instantiation",
+            "named": true
           }
         ]
       },
@@ -2036,6 +2044,32 @@
       }
     }
   },
+  {
+    "type": "schema_instantiation",
+    "named": true,
+    "fields": {
+      "constructor": {
+        "multiple": false,
+        "required": true,
+        "types": [
+          {
+            "type": "call",
+            "named": true
+          }
+        ]
+      },
+      "initialization": {
+        "multiple": false,
+        "required": true,
+        "types": [
+          {
+            "type": "dictionary",
+            "named": true
+          }
+        ]
+      }
+    }
+  },
   {
     "type": "schema_statement",
     "named": true,
@@ -2738,11 +2772,11 @@
   },
   {
     "type": "float",
-    "named": true
+    "named": false
   },
   {
     "type": "float",
-    "named": false
+    "named": true
   },
   {
     "type": "for",