fix: use correct keyword for type aliases

aiken-lang · Jul 12, 2023 · 02527db · 02527db
1 parent 2c9bd21
commit 02527db
Show file tree

Hide file tree

Showing 5 changed files with 88 additions and 94 deletions.
diff --git a/grammar.js b/grammar.js
@@ -8,7 +8,7 @@ module.exports = grammar({
       $.module_comment,
       $.definition_comment,
       $.comment,
-      $.alias
+      $.type_alias
     )),
     _definition: ($) => choice($.import),
 
@@ -37,8 +37,8 @@ module.exports = grammar({
         )
       ),
 
-    alias: ($) =>
-      seq("alias", $.type_definition, "=", $.type_definition),
+    type_alias: ($) =>
+      seq("type", $.type_definition, "=", $.type_definition),
 
     type_definition: ($) =>
       seq($.type_identifier, optional(seq("<", repeat_separated_by($.type_argument, ","), ">"))),

diff --git a/src/grammar.json b/src/grammar.json
@@ -24,7 +24,7 @@
           },
           {
             "type": "SYMBOL",
-            "name": "alias"
+            "name": "type_alias"
           }
         ]
       }
@@ -269,12 +269,12 @@
         }
       ]
     },
-    "alias": {
+    "type_alias": {
       "type": "SEQ",
       "members": [
         {
           "type": "STRING",
-          "value": "alias"
+          "value": "type"
         },
         {
           "type": "SYMBOL",

diff --git a/src/node-types.json b/src/node-types.json
@@ -1,19 +1,4 @@
 [
-  {
-    "type": "alias",
-    "named": true,
-    "fields": {},
-    "children": {
-      "multiple": true,
-      "required": true,
-      "types": [
-        {
-          "type": "type_definition",
-          "named": true
-        }
-      ]
-    }
-  },
   {
     "type": "identifier",
     "named": true,
@@ -68,10 +53,6 @@
       "multiple": true,
       "required": false,
       "types": [
-        {
-          "type": "alias",
-          "named": true
-        },
         {
           "type": "comment",
           "named": true
@@ -87,6 +68,25 @@
         {
           "type": "module_comment",
           "named": true
+        },
+        {
+          "type": "type_alias",
+          "named": true
+        }
+      ]
+    }
+  },
+  {
+    "type": "type_alias",
+    "named": true,
+    "fields": {},
+    "children": {
+      "multiple": true,
+      "required": true,
+      "types": [
+        {
+          "type": "type_definition",
+          "named": true
         }
       ]
     }
@@ -208,10 +208,6 @@
     "type": ">",
     "named": false
   },
-  {
-    "type": "alias",
-    "named": false
-  },
   {
     "type": "as",
     "named": false
@@ -228,6 +224,10 @@
     "type": "module_comment",
     "named": true
   },
+  {
+    "type": "type",
+    "named": false
+  },
   {
     "type": "use",
     "named": false