feat: handle same rules as fields

joker1007 · Nov 22, 2023 · 4cbe7f6 · 4cbe7f6
1 parent 5ef9eaa
commit 4cbe7f6
Show file tree

Hide file tree

Showing 4 changed files with 5,767 additions and 5,641 deletions.
diff --git a/grammar.js b/grammar.js
@@ -62,9 +62,9 @@ module.exports = grammar({
 
     singleton_type: $ => seq("singleton", "(", $.class_name, ")"),
 
-    union_type: $ => prec.left(1, seq($.type, "|", $.type)),
+    union_type: $ => prec.left(1, seq(field("left", $.type), "|", field("right", $.type))),
 
-    intersection_type: $ => prec.left(2, seq($.type, "&", $.type)),
+    intersection_type: $ => prec.left(2, seq(field("left", $.type), "&", field("right", $.type))),
 
     optional_type: $ => prec(3, seq($.type, token.immediate("?"))),
 
@@ -176,8 +176,8 @@ module.exports = grammar({
 
     module_self_type_binds: $ => seq(":", $.module_self_types),
 
-    class_alias_decl: $ => seq("class", $.class_name, "=", $.class_name),
-    module_alias_decl: $ => seq("module", alias($.class_name, $.module_name), "=", alias($.class_name, $.module_name)),
+    class_alias_decl: $ => seq("class", field("new_name", $.class_name), "=", field("origin_name", $.class_name)),
+    module_alias_decl: $ => seq("module", field("new_name", alias($.class_name, $.module_name)), "=", field("origin_name", alias($.class_name, $.module_name))),
 
     module_self_types: $ => choice(
       seq($.class_name, optional($.type_arguments), optional(seq(",", $.module_self_types))),
@@ -319,9 +319,11 @@ module.exports = grammar({
       seq("prepend", $.interface_name, optional($.type_arguments)),
     ),
 
+    singleton_method_name: $ => seq($.self, ".", $.method_name),
+
     alias_member: $ => choice(
-      seq("alias", $.method_name, $.method_name),
-      seq("alias", $.self, ".", $.method_name, $.self, ".", $.method_name),
+      seq("alias", field("new_name", $.method_name), field("origin_name", $.method_name)),
+      seq("alias", field("new_name", $.singleton_method_name), field("origin_name", $.singleton_method_name)),
     ),
 
     ivar_name: $ => /@[a-zA-Z]\w+/,

diff --git a/src/grammar.json b/src/grammar.json
@@ -265,16 +265,24 @@
         "type": "SEQ",
         "members": [
           {
-            "type": "SYMBOL",
-            "name": "type"
+            "type": "FIELD",
+            "name": "left",
+            "content": {
+              "type": "SYMBOL",
+              "name": "type"
+            }
           },
           {
             "type": "STRING",
             "value": "|"
           },
           {
-            "type": "SYMBOL",
-            "name": "type"
+            "type": "FIELD",
+            "name": "right",
+            "content": {
+              "type": "SYMBOL",
+              "name": "type"
+            }
           }
         ]
       }
@@ -286,16 +294,24 @@
         "type": "SEQ",
         "members": [
           {
-            "type": "SYMBOL",
-            "name": "type"
+            "type": "FIELD",
+            "name": "left",
+            "content": {
+              "type": "SYMBOL",
+              "name": "type"
+            }
           },
           {
             "type": "STRING",
             "value": "&"
           },
           {
-            "type": "SYMBOL",
-            "name": "type"
+            "type": "FIELD",
+            "name": "right",
+            "content": {
+              "type": "SYMBOL",
+              "name": "type"
+            }
           }
         ]
       }
@@ -1174,16 +1190,24 @@
           "value": "class"
         },
         {
-          "type": "SYMBOL",
-          "name": "class_name"
+          "type": "FIELD",
+          "name": "new_name",
+          "content": {
+            "type": "SYMBOL",
+            "name": "class_name"
+          }
         },
         {
           "type": "STRING",
           "value": "="
         },
         {
-          "type": "SYMBOL",
-          "name": "class_name"
+          "type": "FIELD",
+          "name": "origin_name",
+          "content": {
+            "type": "SYMBOL",
+            "name": "class_name"
+          }
         }
       ]
     },
@@ -1195,26 +1219,34 @@
           "value": "module"
         },
         {
-          "type": "ALIAS",
+          "type": "FIELD",
+          "name": "new_name",
           "content": {
-            "type": "SYMBOL",
-            "name": "class_name"
-          },
-          "named": true,
-          "value": "module_name"
+            "type": "ALIAS",
+            "content": {
+              "type": "SYMBOL",
+              "name": "class_name"
+            },
+            "named": true,
+            "value": "module_name"
+          }
         },
         {
           "type": "STRING",
           "value": "="
         },
         {
-          "type": "ALIAS",
+          "type": "FIELD",
+          "name": "origin_name",
           "content": {
-            "type": "SYMBOL",
-            "name": "class_name"
-          },
-          "named": true,
-          "value": "module_name"
+            "type": "ALIAS",
+            "content": {
+              "type": "SYMBOL",
+              "name": "class_name"
+            },
+            "named": true,
+            "value": "module_name"
+          }
         }
       ]
     },
@@ -2810,6 +2842,23 @@
         }
       ]
     },
+    "singleton_method_name": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "SYMBOL",
+          "name": "self"
+        },
+        {
+          "type": "STRING",
+          "value": "."
+        },
+        {
+          "type": "SYMBOL",
+          "name": "method_name"
+        }
+      ]
+    },
     "alias_member": {
       "type": "CHOICE",
       "members": [
@@ -2821,12 +2870,20 @@
               "value": "alias"
             },
             {
-              "type": "SYMBOL",
-              "name": "method_name"
+              "type": "FIELD",
+              "name": "new_name",
+              "content": {
+                "type": "SYMBOL",
+                "name": "method_name"
+              }
             },
             {
-              "type": "SYMBOL",
-              "name": "method_name"
+              "type": "FIELD",
+              "name": "origin_name",
+              "content": {
+                "type": "SYMBOL",
+                "name": "method_name"
+              }
             }
           ]
         },
@@ -2838,28 +2895,20 @@
               "value": "alias"
             },
             {
-              "type": "SYMBOL",
-              "name": "self"
-            },
-            {
-              "type": "STRING",
-              "value": "."
-            },
-            {
-              "type": "SYMBOL",
-              "name": "method_name"
-            },
-            {
-              "type": "SYMBOL",
-              "name": "self"
-            },
-            {
-              "type": "STRING",
-              "value": "."
+              "type": "FIELD",
+              "name": "new_name",
+              "content": {
+                "type": "SYMBOL",
+                "name": "singleton_method_name"
+              }
             },
             {
-              "type": "SYMBOL",
-              "name": "method_name"
+              "type": "FIELD",
+              "name": "origin_name",
+              "content": {
+                "type": "SYMBOL",
+                "name": "singleton_method_name"
+              }
             }
           ]
         }