rbs 2.8.4 → 3.8.1

data/ext/rbs_extension/parserstate.c

@@ -4,16 +4,26 @@
 
 id_table *alloc_empty_table(void) {
   id_table *table = malloc(sizeof(id_table));
-  table->size = 10;
-  table->count = 0;
-  table->ids = calloc(10, sizeof(ID));
+
+  *table = (id_table) {
+    .size = 10,
+    .count = 0,
+    .ids = calloc(10, sizeof(ID)),
+    .next = NULL,
+  };
 
   return table;
 }
 
 id_table *alloc_reset_table(void) {
   id_table *table = malloc(sizeof(id_table));
-  table->size = 0;
+
+  *table = (id_table) {
+    .size = 0,
+    .count = 0,
+    .ids = NULL,
+    .next = NULL,
+  };
 
   return table;
 }
@@ -109,6 +119,8 @@ void parser_advance(parserstate *state) {
       // skip
     } else if (state->next_token3.type == tLINECOMMENT) {
       insert_comment_line(state, state->next_token3);
+    } else if (state->next_token3.type == tTRIVIA) {
+      //skip
     } else {
       break;
     }
@@ -180,15 +192,18 @@ VALUE get_comment(parserstate *state, int subject_line) {
 }
 
 comment *alloc_comment(token comment_token, comment *last_comment) {
-  comment *new_comment = calloc(1, sizeof(comment));
+  comment *new_comment = malloc(sizeof(comment));
 
-  new_comment->next_comment = last_comment;
+  *new_comment = (comment) {
+    .start = comment_token.range.start,
+    .end = comment_token.range.end,
 
-  new_comment->start = comment_token.range.start;
-  new_comment->end = comment_token.range.end;
+    .line_size = 0,
+    .line_count = 0,
+    .tokens = NULL,
 
-  new_comment->line_size = 0;
-  new_comment->line_count = 0;
+    .next_comment = last_comment,
+  };
 
   comment_insert_new_line(new_comment, comment_token);
 
@@ -272,27 +287,52 @@ VALUE comment_to_ruby(comment *com, VALUE buffer) {
   );
 }
 
-parserstate *alloc_parser(VALUE buffer, int start_pos, int end_pos, VALUE variables) {
-  VALUE string = rb_funcall(buffer, rb_intern("content"), 0);
+lexstate *alloc_lexer(VALUE string, int start_pos, int end_pos) {
+  if (start_pos < 0 || end_pos < 0) {
+    rb_raise(rb_eArgError, "negative position range: %d...%d", start_pos, end_pos);
+  }
 
-  StringValue(string);
+  lexstate *lexer = malloc(sizeof(lexstate));
+
+  position start_position = (position) {
+    .byte_pos = 0,
+    .char_pos = 0,
+    .line = 1,
+    .column = 0,
+  };
+
+  *lexer = (lexstate) {
+    .string = string,
+    .start_pos = start_pos,
+    .end_pos = end_pos,
+    .current = start_position,
+    .start = { 0 },
+    .first_token_of_line = false,
+    .last_char = 0,
+  };
 
-  lexstate *lexer = calloc(1, sizeof(lexstate));
-  lexer->string = string;
-  lexer->current.line = 1;
-  lexer->start_pos = start_pos;
-  lexer->end_pos = end_pos;
   skipn(lexer, start_pos);
   lexer->start = lexer->current;
   lexer->first_token_of_line = lexer->current.column == 0;
 
-  parserstate *parser = calloc(1, sizeof(parserstate));
-  parser->lexstate = lexer;
-  parser->buffer = buffer;
-  parser->current_token = NullToken;
-  parser->next_token = NullToken;
-  parser->next_token2 = NullToken;
-  parser->next_token3 = NullToken;
+  return lexer;
+}
+
+parserstate *alloc_parser(VALUE buffer, lexstate *lexer, int start_pos, int end_pos, VALUE variables) {
+  parserstate *parser = malloc(sizeof(parserstate));
+
+  *parser = (parserstate) {
+    .lexstate = lexer,
+
+    .current_token = NullToken,
+    .next_token = NullToken,
+    .next_token2 = NullToken,
+    .next_token3 = NullToken,
+    .buffer = buffer,
+
+    .vars = NULL,
+    .last_comment = NULL,
+  };
 
   parser_advance(parser);
   parser_advance(parser);

data/ext/rbs_extension/parserstate.h

@@ -93,15 +93,25 @@ void parser_insert_typevar(parserstate *state, ID id);
  * */
 bool parser_typevar_member(parserstate *state, ID id);
 
+/**
+ * Allocate new lexstate object.
+ *
+ * ```
+ * VALUE string = rb_funcall(buffer, rb_intern("content"), 0);
+ * alloc_lexer(string, 0, 31)    // New lexstate with buffer content
+ * ```
+ * */
+lexstate *alloc_lexer(VALUE string, int start_pos, int end_pos);
+
 /**
  * Allocate new parserstate object.
  *
  * ```
- * alloc_parser(buffer, 0, 1, variables)    // New parserstate with variables
- * alloc_parser(buffer, 3, 5, Qnil)         // New parserstate without variables
+ * alloc_parser(buffer, lexer, 0, 1, variables)    // New parserstate with variables
+ * alloc_parser(buffer, lexer, 3, 5, Qnil)         // New parserstate without variables
  * ```
  * */
-parserstate *alloc_parser(VALUE buffer, int start_pos, int end_pos, VALUE variables);
+parserstate *alloc_parser(VALUE buffer, lexstate *lexer, int start_pos, int end_pos, VALUE variables);
 void free_parser(parserstate *parser);
 /**
  * Advance one token.

data/ext/rbs_extension/rbs_extension.h

@@ -4,18 +4,9 @@
 #include "ruby/re.h"
 #include "ruby/encoding.h"
 
+#include "rbs.h"
 #include "lexer.h"
 #include "parser.h"
-#include "constants.h"
-#include "ruby_objs.h"
-
-/**
- * Unescape escape sequences in the given string inplace:
- *
- *   '\\n' => "\n"
- *
- * */
-void rbs_unescape_string(VALUE string, bool dq_string);
 
 /**
  * Receives `parserstate` and `range`, which represents a string token or symbol token, and returns a string VALUE.

data/ext/rbs_extension/unescape.c

@@ -1,49 +1,5 @@
 #include "rbs_extension.h"
 
-static VALUE DQ_REGEXP = 0;
-static VALUE SQ_REGEXP = 0;
-static VALUE HASH = 0;
-
-static const char *dq_regexp_str = "\\\\[abefnrstv\"\\\\]";
-static const char *sq_regexp_str = "\\\\[\'\\\\]";
-
-static ID gsub = 0;
-
-void rbs_unescape_string(VALUE string, bool dq_string) {
-  if (!DQ_REGEXP) {
-    DQ_REGEXP = rb_reg_new(dq_regexp_str, strlen(dq_regexp_str), 0);
-    rb_global_variable(&DQ_REGEXP);
-  }
-
-  if (!SQ_REGEXP) {
-    SQ_REGEXP = rb_reg_new(sq_regexp_str, strlen(sq_regexp_str), 0);
-    rb_global_variable(&SQ_REGEXP);
-  }
-
-  if (!gsub) {
-    gsub = rb_intern("gsub!");
-  }
-
-  if (!HASH) {
-    HASH = rb_hash_new();
-    rb_global_variable(&HASH);
-    rb_hash_aset(HASH, rb_str_new_literal("\\a"), rb_str_new_literal("\a"));
-    rb_hash_aset(HASH, rb_str_new_literal("\\b"), rb_str_new_literal("\b"));
-    rb_hash_aset(HASH, rb_str_new_literal("\\e"), rb_str_new_literal("\033"));
-    rb_hash_aset(HASH, rb_str_new_literal("\\f"), rb_str_new_literal("\f"));
-    rb_hash_aset(HASH, rb_str_new_literal("\\n"), rb_str_new_literal("\n"));
-    rb_hash_aset(HASH, rb_str_new_literal("\\r"), rb_str_new_literal("\r"));
-    rb_hash_aset(HASH, rb_str_new_literal("\\s"), rb_str_new_literal(" "));
-    rb_hash_aset(HASH, rb_str_new_literal("\\t"), rb_str_new_literal("\t"));
-    rb_hash_aset(HASH, rb_str_new_literal("\\v"), rb_str_new_literal("\v"));
-    rb_hash_aset(HASH, rb_str_new_literal("\\\""), rb_str_new_literal("\""));
-    rb_hash_aset(HASH, rb_str_new_literal("\\\'"), rb_str_new_literal("'"));
-    rb_hash_aset(HASH, rb_str_new_literal("\\\\"), rb_str_new_literal("\\"));
-  }
-
-  rb_funcall(string, gsub, 2, dq_string ? DQ_REGEXP : SQ_REGEXP, HASH);
-}
-
 VALUE rbs_unquote_string(parserstate *state, range rg, int offset_bytes) {
   VALUE string = state->lexstate->string;
   rb_encoding *enc = rb_enc_get(string);
@@ -65,8 +21,12 @@ VALUE rbs_unquote_string(parserstate *state, range rg, int offset_bytes) {
   char *buffer = RSTRING_PTR(state->lexstate->string) + rg.start.byte_pos + offset_bytes;
   VALUE str = rb_enc_str_new(buffer, byte_length, enc);
 
-  rbs_unescape_string(str, first_char == '\"');
-
-  return str;
+  return rb_funcall(
+    RBS_Types_Literal,
+    rb_intern("unescape_string"),
+    2,
+    str,
+    first_char == '\"' ? Qtrue : Qfalse
+  );
 }
 

data/goodcheck.yml

@@ -13,9 +13,9 @@ rules:
     glob:
       - "{core,stdlib}/**/*.rbs"
     fail:
-      - "def `send`: (String | Symbol arg0, *untyped arg1) -> untyped"
+      - "def `send`: (interned arg0, *untyped arg1) -> untyped"
     pass:
-      - "def `send`: (String | Symbol, *untyped) -> untyped"
+      - "def `send`: (interned, *untyped) -> untyped"
 
   - id: rbs.prefer_boolish
     pattern:

data/{ext/rbs_extension → include/rbs}/constants.h

@@ -1,24 +1,38 @@
+/*----------------------------------------------------------------------------*/
+/* This file is generated by the templates/template.rb script and should not  */
+/* be modified manually.                                                      */
+/* To change the template see                                                 */
+/* templates/include/rbs/constants.h.erb                                      */
+/*----------------------------------------------------------------------------*/
+
 #ifndef RBS__CONSTANTS_H
 #define RBS__CONSTANTS_H
 
 extern VALUE RBS;
 
 extern VALUE RBS_AST;
+extern VALUE RBS_AST_Declarations;
+extern VALUE RBS_AST_Directives;
+extern VALUE RBS_AST_Members;
+extern VALUE RBS_Types;
+extern VALUE RBS_Types_Bases;
+extern VALUE RBS_ParsingError;
+
 extern VALUE RBS_AST_Annotation;
 extern VALUE RBS_AST_Comment;
-extern VALUE RBS_AST_TypeParam;
-
-extern VALUE RBS_AST_Declarations;
-extern VALUE RBS_AST_Declarations_Alias;
-extern VALUE RBS_AST_Declarations_Class_Super;
 extern VALUE RBS_AST_Declarations_Class;
+extern VALUE RBS_AST_Declarations_Class_Super;
+extern VALUE RBS_AST_Declarations_ClassAlias;
 extern VALUE RBS_AST_Declarations_Constant;
 extern VALUE RBS_AST_Declarations_Global;
 extern VALUE RBS_AST_Declarations_Interface;
-extern VALUE RBS_AST_Declarations_Module_Self;
 extern VALUE RBS_AST_Declarations_Module;
-
-extern VALUE RBS_AST_Members;
+extern VALUE RBS_AST_Declarations_Module_Self;
+extern VALUE RBS_AST_Declarations_ModuleAlias;
+extern VALUE RBS_AST_Declarations_TypeAlias;
+extern VALUE RBS_AST_Directives_Use;
+extern VALUE RBS_AST_Directives_Use_SingleClause;
+extern VALUE RBS_AST_Directives_Use_WildcardClause;
 extern VALUE RBS_AST_Members_Alias;
 extern VALUE RBS_AST_Members_AttrAccessor;
 extern VALUE RBS_AST_Members_AttrReader;
@@ -29,19 +43,15 @@ extern VALUE RBS_AST_Members_Extend;
 extern VALUE RBS_AST_Members_Include;
 extern VALUE RBS_AST_Members_InstanceVariable;
 extern VALUE RBS_AST_Members_MethodDefinition;
+extern VALUE RBS_AST_Members_MethodDefinition_Overload;
 extern VALUE RBS_AST_Members_Prepend;
 extern VALUE RBS_AST_Members_Private;
 extern VALUE RBS_AST_Members_Public;
-
+extern VALUE RBS_AST_TypeParam;
 extern VALUE RBS_MethodType;
 extern VALUE RBS_Namespace;
-
-extern VALUE RBS_ParsingError;
 extern VALUE RBS_TypeName;
-
-extern VALUE RBS_Types;
 extern VALUE RBS_Types_Alias;
-extern VALUE RBS_Types_Bases;
 extern VALUE RBS_Types_Bases_Any;
 extern VALUE RBS_Types_Bases_Bool;
 extern VALUE RBS_Types_Bases_Bottom;
@@ -54,8 +64,8 @@ extern VALUE RBS_Types_Bases_Void;
 extern VALUE RBS_Types_Block;
 extern VALUE RBS_Types_ClassInstance;
 extern VALUE RBS_Types_ClassSingleton;
-extern VALUE RBS_Types_Function_Param;
 extern VALUE RBS_Types_Function;
+extern VALUE RBS_Types_Function_Param;
 extern VALUE RBS_Types_Interface;
 extern VALUE RBS_Types_Intersection;
 extern VALUE RBS_Types_Literal;
@@ -64,6 +74,7 @@ extern VALUE RBS_Types_Proc;
 extern VALUE RBS_Types_Record;
 extern VALUE RBS_Types_Tuple;
 extern VALUE RBS_Types_Union;
+extern VALUE RBS_Types_UntypedFunction;
 extern VALUE RBS_Types_Variable;
 
 void rbs__init_constants();

data/include/rbs/ruby_objs.h

@@ -0,0 +1,72 @@
+/*----------------------------------------------------------------------------*/
+/* This file is generated by the templates/template.rb script and should not  */
+/* be modified manually.                                                      */
+/* To change the template see                                                 */
+/* templates/include/rbs/ruby_objs.h.erb                                      */
+/*----------------------------------------------------------------------------*/
+
+#ifndef RBS__RUBY_OBJS_H
+#define RBS__RUBY_OBJS_H
+
+#include "ruby.h"
+
+VALUE rbs_ast_annotation(VALUE string, VALUE location);
+VALUE rbs_ast_comment(VALUE string, VALUE location);
+VALUE rbs_ast_decl_class(VALUE name, VALUE type_params, VALUE super_class, VALUE members, VALUE annotations, VALUE location, VALUE comment);
+VALUE rbs_ast_decl_class_super(VALUE name, VALUE args, VALUE location);
+VALUE rbs_ast_decl_class_alias(VALUE new_name, VALUE old_name, VALUE location, VALUE comment);
+VALUE rbs_ast_decl_constant(VALUE name, VALUE type, VALUE location, VALUE comment);
+VALUE rbs_ast_decl_global(VALUE name, VALUE type, VALUE location, VALUE comment);
+VALUE rbs_ast_decl_interface(VALUE name, VALUE type_params, VALUE members, VALUE annotations, VALUE location, VALUE comment);
+VALUE rbs_ast_decl_module(VALUE name, VALUE type_params, VALUE self_types, VALUE members, VALUE annotations, VALUE location, VALUE comment);
+VALUE rbs_ast_decl_module_self(VALUE name, VALUE args, VALUE location);
+VALUE rbs_ast_decl_module_alias(VALUE new_name, VALUE old_name, VALUE location, VALUE comment);
+VALUE rbs_ast_decl_type_alias(VALUE name, VALUE type_params, VALUE type, VALUE annotations, VALUE location, VALUE comment);
+VALUE rbs_ast_directives_use(VALUE clauses, VALUE location);
+VALUE rbs_ast_directives_use_single_clause(VALUE type_name, VALUE new_name, VALUE location);
+VALUE rbs_ast_directives_use_wildcard_clause(VALUE namespace, VALUE location);
+VALUE rbs_ast_members_alias(VALUE new_name, VALUE old_name, VALUE kind, VALUE annotations, VALUE location, VALUE comment);
+VALUE rbs_ast_members_attr_accessor(VALUE name, VALUE type, VALUE ivar_name, VALUE kind, VALUE annotations, VALUE location, VALUE comment, VALUE visibility);
+VALUE rbs_ast_members_attr_reader(VALUE name, VALUE type, VALUE ivar_name, VALUE kind, VALUE annotations, VALUE location, VALUE comment, VALUE visibility);
+VALUE rbs_ast_members_attr_writer(VALUE name, VALUE type, VALUE ivar_name, VALUE kind, VALUE annotations, VALUE location, VALUE comment, VALUE visibility);
+VALUE rbs_ast_members_class_instance_variable(VALUE name, VALUE type, VALUE location, VALUE comment);
+VALUE rbs_ast_members_class_variable(VALUE name, VALUE type, VALUE location, VALUE comment);
+VALUE rbs_ast_members_extend(VALUE name, VALUE args, VALUE annotations, VALUE location, VALUE comment);
+VALUE rbs_ast_members_include(VALUE name, VALUE args, VALUE annotations, VALUE location, VALUE comment);
+VALUE rbs_ast_members_instance_variable(VALUE name, VALUE type, VALUE location, VALUE comment);
+VALUE rbs_ast_members_method_definition(VALUE name, VALUE kind, VALUE overloads, VALUE annotations, VALUE location, VALUE comment, VALUE overloading, VALUE visibility);
+VALUE rbs_ast_members_method_definition_overload(VALUE annotations, VALUE method_type);
+VALUE rbs_ast_members_prepend(VALUE name, VALUE args, VALUE annotations, VALUE location, VALUE comment);
+VALUE rbs_ast_members_private(VALUE location);
+VALUE rbs_ast_members_public(VALUE location);
+VALUE rbs_ast_type_param(VALUE name, VALUE variance, VALUE upper_bound, VALUE default_type, VALUE location);
+VALUE rbs_method_type(VALUE type_params, VALUE type, VALUE block, VALUE location);
+VALUE rbs_namespace(VALUE path, VALUE absolute);
+VALUE rbs_type_name(VALUE namespace, VALUE name);
+VALUE rbs_alias(VALUE name, VALUE args, VALUE location);
+VALUE rbs_bases_any(VALUE location);
+VALUE rbs_bases_bool(VALUE location);
+VALUE rbs_bases_bottom(VALUE location);
+VALUE rbs_bases_class(VALUE location);
+VALUE rbs_bases_instance(VALUE location);
+VALUE rbs_bases_nil(VALUE location);
+VALUE rbs_bases_self(VALUE location);
+VALUE rbs_bases_top(VALUE location);
+VALUE rbs_bases_void(VALUE location);
+VALUE rbs_block(VALUE type, VALUE required, VALUE self_type);
+VALUE rbs_class_instance(VALUE name, VALUE args, VALUE location);
+VALUE rbs_class_singleton(VALUE name, VALUE location);
+VALUE rbs_function(VALUE required_positionals, VALUE optional_positionals, VALUE rest_positionals, VALUE trailing_positionals, VALUE required_keywords, VALUE optional_keywords, VALUE rest_keywords, VALUE return_type);
+VALUE rbs_function_param(VALUE type, VALUE name, VALUE location);
+VALUE rbs_interface(VALUE name, VALUE args, VALUE location);
+VALUE rbs_intersection(VALUE types, VALUE location);
+VALUE rbs_literal(VALUE literal, VALUE location);
+VALUE rbs_optional(VALUE type, VALUE location);
+VALUE rbs_proc(VALUE type, VALUE block, VALUE location, VALUE self_type);
+VALUE rbs_record(VALUE all_fields, VALUE location);
+VALUE rbs_tuple(VALUE types, VALUE location);
+VALUE rbs_union(VALUE types, VALUE location);
+VALUE rbs_untyped_function(VALUE return_type);
+VALUE rbs_variable(VALUE name, VALUE location);
+
+#endif

data/include/rbs.h

@@ -0,0 +1,7 @@
+#ifndef RBS_H
+#define RBS_H
+
+#include "rbs/constants.h"
+#include "rbs/ruby_objs.h"
+
+#endif

data/lib/rbs/annotate/annotations.rb

@@ -93,7 +93,7 @@ module RBS
           case
           when match = source.match(/(?<constant_name>[^#]+)#(?<method_name>.+)/)
             [
-              TypeName(match[:constant_name] || raise),
+              TypeName.parse(match[:constant_name] || raise),
               [
                 false,
                 (match[:method_name] or raise).to_sym
@@ -101,7 +101,7 @@ module RBS
             ]
           when match = source.match(/(?<constant_name>[^#]+)\.(?<method_name>.+)/)
             [
-              TypeName(match[:constant_name] || raise),
+              TypeName.parse(match[:constant_name] || raise),
               [
                 true,
                 (match[:method_name] or raise).to_sym
@@ -109,7 +109,7 @@ module RBS
             ]
           else
             [
-              TypeName(source),
+              TypeName.parse(source),
               nil
             ]
           end

data/lib/rbs/annotate/formatter.rb

@@ -59,10 +59,20 @@ module RBS
 
       def self.each_part(doc, &block)
         if block
-          if doc.file
-            yield doc
+          document =
+            case doc
+            when String
+              raise
+            when RDoc::Comment
+              document = doc.parse
+            when RDoc::Markup::Document
+              document = doc
+            end
+
+          if document.file
+            yield document
           else
-            doc.each do |d|
+            document.each do |d|
               each_part(d, &block)
             end
           end

data/lib/rbs/annotate/rdoc_annotator.rb

@@ -16,7 +16,7 @@ module RBS
       def annotate_file(path, preserve:)
         content = path.read()
 
-        decls = Parser.parse_signature(content)
+        _, _, decls = Parser.parse_signature(content)
 
         annotate_decls(decls)
 

data/lib/rbs/annotate/rdoc_source.rb

@@ -31,7 +31,7 @@ module RBS
       end
 
       def find_class(typename)
-        classes = []
+        classes = [] #: Array[::RDoc::ClassModule]
 
         @stores.each do |store|
           if klass = store.find_class_or_module(typename.relative!.to_s)
@@ -47,7 +47,16 @@ module RBS
       def docs
         if ds = yield
           unless ds.empty?
-            ds.map(&:comment)
+            ds.map do |code_object|
+              case comment = code_object.comment
+              when String
+                raise
+              when RDoc::Comment
+                comment.parse
+              when RDoc::Markup::Document
+                comment
+              end
+            end
           end
         end
       end
@@ -61,7 +70,7 @@ module RBS
       def find_const(const_name)
         namespace =
           if const_name.namespace.empty?
-            TypeName("::Object")
+            TypeName.parse("::Object")
           else
             const_name.namespace.to_type_name
           end

data/lib/rbs/ast/declarations.rb

@@ -104,6 +104,18 @@ module RBS
           @comment = comment
         end
 
+        def update(name: self.name, type_params: self.type_params, super_class: self.super_class, members: self.members, annotations: self.annotations, location: self.location, comment: self.comment)
+          self.class.new(
+            name: name,
+            type_params: type_params,
+            super_class: super_class,
+            members: members,
+            annotations: annotations,
+            location: location,
+            comment: comment
+          )
+        end
+
         def ==(other)
           other.is_a?(Class) &&
             other.name == name &&
@@ -192,6 +204,19 @@ module RBS
           @comment = comment
         end
 
+        def update(name: self.name, type_params: self.type_params, members: self.members, self_types: self.self_types, annotations: self.annotations, location: self.location, comment: self.comment)
+          self.class.new(
+            name: name,
+            type_params: type_params,
+            members: members,
+            self_types: self_types,
+            annotations: annotations,
+            location: location,
+            comment: comment
+          )
+        end
+
+
         def ==(other)
           other.is_a?(Module) &&
             other.name == name &&
@@ -239,6 +264,17 @@ module RBS
           @comment = comment
         end
 
+        def update(name: self.name, type_params: self.type_params, members: self.members, annotations: self.annotations, location: self.location, comment: self.comment)
+          self.class.new(
+            name: name,
+            type_params: type_params,
+            members: members,
+            annotations: annotations,
+            location: location,
+            comment: comment
+          )
+        end
+
         def ==(other)
           other.is_a?(Interface) &&
             other.name == name &&
@@ -265,7 +301,7 @@ module RBS
         end
       end
 
-      class Alias < Base
+      class TypeAlias < Base
         attr_reader :name
         attr_reader :type_params
         attr_reader :type
@@ -283,7 +319,7 @@ module RBS
         end
 
         def ==(other)
-          other.is_a?(Alias) &&
+          other.is_a?(TypeAlias) &&
             other.name == name &&
             other.type_params == type_params &&
             other.type == type
@@ -379,6 +415,53 @@ module RBS
           }.to_json(state)
         end
       end
+
+      class AliasDecl < Base
+        attr_reader :new_name, :old_name, :location, :comment
+
+        def initialize(new_name:, old_name:, location:, comment:)
+          @new_name = new_name
+          @old_name = old_name
+          @location = location
+          @comment = comment
+        end
+
+        def ==(other)
+          other.is_a?(self.class) &&
+            other.new_name == new_name &&
+            other.old_name == old_name
+        end
+
+        alias eql? ==
+
+        def hash
+          self.class.hash ^ new_name.hash ^ old_name.hash
+        end
+      end
+
+      class ClassAlias < AliasDecl
+        def to_json(state = _ = nil)
+          {
+            declaration: :class_alias,
+            new_name: new_name,
+            old_name: old_name,
+            location: location,
+            comment: comment
+          }.to_json(state)
+        end
+      end
+
+      class ModuleAlias < AliasDecl
+        def to_json(state = _ = nil)
+          {
+            declaration: :module_alias,
+            new_name: new_name,
+            old_name: old_name,
+            location: location,
+            comment: comment
+          }.to_json(state)
+        end
+      end
     end
   end
 end