rbs 3.7.0.dev.1 → 3.7.0.pre.1

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/collection/config/lockfile_generator.rb

@@ -4,6 +4,8 @@ module RBS
   module Collection
     class Config
       class LockfileGenerator
+        ALUMNI_STDLIBS = { "mutex_m" => ">= 0.3.0" }
+
         class GemfileLockMismatchError < StandardError
           def initialize(expected:, actual:)
             @expected = expected
@@ -58,9 +60,10 @@ module RBS
 
         def generate
           config.gems.each do |gem|
-            if Sources::Stdlib.instance.has?(gem["name"], nil) || gem.dig("source", "type") == "stdlib"
+            case
+            when gem.dig("source", "type") == "stdlib"
               unless gem.fetch("ignore", false)
-                assign_stdlib(name: gem["name"], from_gem: nil)
+                assign_stdlib(name: gem["name"])
               end
             else
               assign_gem(name: gem["name"], version: gem["version"])
@@ -113,6 +116,11 @@ module RBS
                   find_source(name: name)
                 end
 
+              if source.is_a?(Sources::Stdlib)
+                assign_stdlib(name: name)
+                return
+              end
+
               if source
                 installed_version = version
                 best_version = find_best_version(version: installed_version, versions: source.versions(name))
@@ -149,16 +157,37 @@ module RBS
           end
         end
 
-        private def assign_stdlib(name:, from_gem:)
+        private def assign_stdlib(name:, from_gem: nil)
           return if lockfile.gems.key?(name)
 
           case name
           when 'rubygems', 'set'
             msg = "`#{name}` has been moved to core library, so it is always loaded. Remove explicit loading `#{name}`"
             msg << " from `#{from_gem}`" if from_gem
-            RBS.logger.warn msg
-
+            msg << "."
             return
+          when *ALUMNI_STDLIBS.keys
+            version = ALUMNI_STDLIBS.fetch(name)
+            if from_gem
+              # From `dependencies:` of a `manifest.yaml` of a gem
+              source = find_source(name: name) or raise
+              if source.is_a?(Sources::Stdlib)
+                RBS.logger.warn {
+                  "`#{name}` is included in the RBS dependencies of `#{from_gem}`, but the type definition as a stdlib in rbs-gem is deprecated. Add `#{name}` (#{version}) to the dependency of your Ruby program to use the gem-bundled type definition."
+                }
+              else
+                RBS.logger.info {
+                  "`#{name}` is included in the RBS dependencies of `#{from_gem}`, but the type definition as a stdlib in rbs-gem is deprecated. Delete `#{name}` from the RBS dependencies of `#{from_gem}`."
+                }
+                assign_gem(name: name, version: nil)
+                return
+              end
+            else
+              # From `gems:` of a `rbs_collection.yaml`
+              RBS.logger.warn {
+                "`#{name}` as a stdlib in rbs-gem is deprecated. Add `#{name}` (#{version}) to the dependency of your Ruby program to use the gem-bundled type definition."
+              }
+            end
           end
 
           source = Sources::Stdlib.instance

data/lib/rbs/collection/config.rb

@@ -66,8 +66,8 @@ module RBS
       def sources
         @sources ||= [
           Sources::Rubygems.instance,
-          Sources::Stdlib.instance,
-          *@data['sources'].map { |c| Sources.from_config_entry(c, base_directory: @config_path.dirname) }
+          *@data['sources'].map { |c| Sources.from_config_entry(c, base_directory: @config_path.dirname) },
+          Sources::Stdlib.instance
         ]
       end
 

data/lib/rbs/environment_loader.rb

@@ -113,6 +113,11 @@ module RBS
       # @type var loaded: Array[[AST::Declarations::t, Pathname, source]]
       loaded = []
 
+      # For migrating stringio to stdlib
+      if @core_root && libs.none? { |lib| lib.name == 'stringio' }
+        add(library: 'stringio', version: nil)
+      end
+
       each_signature do |source, path, buffer, decls, dirs|
         decls.each do |decl|
           loaded << [decl, path, source]

data/lib/rbs/prototype/rb.rb

@@ -368,7 +368,7 @@ module RBS
                        when node.children[0].is_a?(Symbol)
                          TypeName.new(name: node.children[0], namespace: Namespace.empty)
                        else
-                         const_to_name!(node.children[0])
+                         const_to_name!(node.children[0], context: context)
                        end
 
           value_node = node.children.last
@@ -429,13 +429,13 @@ module RBS
         end
       end
 
-      def const_to_name!(node)
+      def const_to_name!(node, context: nil)
         case node.type
         when :CONST
           TypeName.new(name: node.children[0], namespace: Namespace.empty)
         when :COLON2
           if node.children[0]
-            namespace = const_to_name!(node.children[0]).to_namespace
+            namespace = const_to_name!(node.children[0], context: context).to_namespace
           else
             namespace = Namespace.empty
           end
@@ -443,6 +443,10 @@ module RBS
           TypeName.new(name: node.children[1], namespace: namespace)
         when :COLON3
           TypeName.new(name: node.children[0], namespace: Namespace.root)
+        when :SELF
+          raise if context.nil?
+
+          context.namespace.to_type_name
         else
           raise
         end

data/lib/rbs/types.rb

@@ -521,13 +521,20 @@ module RBS
       def initialize(all_fields: nil, fields: nil, location:)
         case
         when fields && all_fields.nil?
-          @all_fields = fields.map { |k, v| [k, [v, true]] }.to_h
+          @all_fields = fields.transform_values { |v| [v, true] }
           @fields = fields
           @optional_fields = {}
         when all_fields && fields.nil?
           @all_fields = all_fields
-          @fields = all_fields.filter_map { |k, (v, required)| [k, v] if required }.to_h
-          @optional_fields = all_fields.filter_map { |k, (v, required)| [k, v] unless required }.to_h
+          @fields = {}
+          @optional_fields = {}
+          all_fields.each do |(k, (v, required))|
+            if required
+              @fields[k] = v
+            else
+              @optional_fields[k] = v
+            end
+          end
         else
           raise ArgumentError, "only one of `:fields` or `:all_fields` is requireds"
         end

data/lib/rbs/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RBS
-  VERSION = "3.7.0.dev.1"
+  VERSION = "3.7.0.pre.1"
 end

data/sig/ancestor_graph.rbs

@@ -1,5 +1,5 @@
 module RBS
-  # AncestorGraph is a utility class that helps iterating through ancestors and decendants of a class/module
+  # AncestorGraph is a utility class that helps iterating through ancestors and descendants of a class/module
   #
   # ```ruby
   # graph = AncestorGraph.new(env: env, ancestor_builder: ancestor_builder)

data/sig/collection/config/lockfile_generator.rbs

@@ -2,6 +2,10 @@ module RBS
   module Collection
     class Config
       class LockfileGenerator
+        # Name of stdlibs that was rbs-bundled stdlib but is now a gem.
+        #
+        ALUMNI_STDLIBS: Hash[String, String]
+
         class GemfileLockMismatchError < StandardError
           @expected: Pathname
 
@@ -43,7 +47,11 @@ module RBS
         #
         def assign_gem: (name: String, version: String?, ?skip: bool) -> void
 
-        def assign_stdlib: (name: String, from_gem: String?) -> void
+        # Assign a gem from stdlib to lockfile
+        #
+        # `from_gem` is a String when the stdlib is assigned through the `dependencies:` in `manifest.yaml` of a gem.
+        #
+        def assign_stdlib: (name: String, ?from_gem: String) -> void
 
         # Find a source of a gem from ones registered in `config.sources`
         #

data/sig/definition.rbs

@@ -27,7 +27,7 @@ module RBS
         # Annotations given to the overload associated to the method type
         attr_reader overload_annotations: Array[AST::Annotation]
 
-        # Concatnation of `member_annotations` and `overload_annotations`
+        # Concatenation of `member_annotations` and `overload_annotations`
         attr_reader annotations: Array[AST::Annotation]
 
         def initialize: (type: MethodType, member: method_member, defined_in: TypeName, implemented_in: TypeName?, ?overload_annotations: Array[AST::Annotation]) -> void

data/sig/definition_builder.rbs

@@ -157,7 +157,7 @@ module RBS
     # Returns a substitution that corresponds to type application
     #
     # ```
-    # tapp_subst(`::Array`, [`::Integer`]) # => Subsitution.build([:Elem], [`::Integer`])
+    # tapp_subst(`::Array`, [`::Integer`]) # => Substitution.build([:Elem], [`::Integer`])
     # ```
     #
     def tapp_subst: (TypeName, Array[Types::t]) -> Substitution

data/sig/environment.rbs

@@ -233,7 +233,7 @@ module RBS
     def normalize_type_name?: (TypeName) -> (TypeName | nil | false)
 
     # Normalize the type name or raises an error
-    # 
+    #
     def normalize_type_name!: (TypeName) -> TypeName
 
     # Returns a normalized module/class name or a type name with a normalized namespace

data/sig/prototype/rb.rbs

@@ -44,7 +44,7 @@ module RBS
       # Returns a type name that represents the name of the constant.
       # `node` must be _constant_ node, `CONST`, `COLON2`, or `COLON3` node.
       #
-      def const_to_name!: (RubyVM::AbstractSyntaxTree::Node node) -> TypeName
+      def const_to_name!: (RubyVM::AbstractSyntaxTree::Node node, ?context: Context?) -> TypeName
 
       # Returns a type name that represents the name of the constant.
       # `node` can be `SELF` for `extend self` pattern.

data/sig/type_alias_dependency.rbs

@@ -1,5 +1,5 @@
 module RBS
-  # TypeAliasDependency calculates the dependnecies between type aliases
+  # TypeAliasDependency calculates the dependencies between type aliases
   #
   # The dependencies are normalized automatically.
   #
@@ -12,7 +12,7 @@ module RBS
     #
     attr_reader direct_dependencies: Hash[TypeName, Set[TypeName]]
 
-    # A hash table from type alias name to a hash name with keys of transitive dependnecies
+    # A hash table from type alias name to a hash name with keys of transitive dependencies
     #
     # The source type name and dependencies are normalized.
     #

data/sig/type_alias_regularity.rbs

@@ -71,7 +71,7 @@ module RBS
     def initialize: (env: Environment) -> void
 
     # Returns `Diagnostic` instance if the alias type is nonregular.
-    # Regurns `nil` if the alias type is regular.
+    # Returns `nil` if the alias type is regular.
     #
     # Normalizes the given type name automatically.
     #

data/sig/type_param.rbs

@@ -75,7 +75,7 @@ module RBS
 
       def to_s: () -> String
 
-      # Validates TypeParams if it refers another optiional type params
+      # Validates TypeParams if it refers another optional type params
       #
       # * Returns array of TypeParam objects that refers other optional type params
       # * Returns `nil` if all type params are valid
@@ -86,7 +86,7 @@ module RBS
       #
       def self.application: (Array[TypeParam], Array[Types::t]) -> Substitution?
 
-      # Returns an array of type args, that fills ommited types with the defaults
+      # Returns an array of type args, that fills omitted types with the defaults
       #
       # ```rbs
       # interface _Foo[T, S = untyped]
@@ -102,7 +102,7 @@ module RBS
       # _Foo[String, Integer, untyped] # => _Foo[String, Integer, untyped]  (Keeping extra args)
       # ```
       #
-      # Note that it allows iinvalid arities, returning the `args` immediately.
+      # Note that it allows invalid arities, returning the `args` immediately.
       #
       def self.normalize_args: (Array[TypeParam], Array[Types::t]) -> Array[Types::t]
     end

data/sig/vendorer.rbs

@@ -24,7 +24,7 @@ module RBS
   # vendor/rbs/minitest-1.2.3  => Will include `minitest` library RBSs.
   # ```
   #
-  # The vendorerd RBSs will be loaded through :dir source.
+  # The vendored RBSs will be loaded through :dir source.
   #
   # ```rb
   # loader = RBS::EnvironmentLoader.new(core_root: nil, repository: RBS::Repository.new(no_stdlib: true))

data/{ext/rbs_extension → src}/constants.c

@@ -1,32 +1,38 @@
+/*----------------------------------------------------------------------------*/
+/* This file is generated by the templates/template.rb script and should not  */
+/* be modified manually.                                                      */
+/* To change the template see                                                 */
+/* templates/src/constants.c.erb                                              */
+/*----------------------------------------------------------------------------*/
+
 #include "rbs_extension.h"
 
 VALUE RBS_Parser;
 
 VALUE RBS;
 VALUE RBS_AST;
-VALUE RBS_AST_Comment;
-VALUE RBS_AST_Annotation;
-VALUE RBS_AST_TypeParam;
-
 VALUE RBS_AST_Declarations;
+VALUE RBS_AST_Directives;
+VALUE RBS_AST_Members;
+VALUE RBS_Parser;
+VALUE RBS_Types;
+VALUE RBS_Types_Bases;
 
-VALUE RBS_AST_Declarations_TypeAlias;
+VALUE RBS_AST_Annotation;
+VALUE RBS_AST_Comment;
+VALUE RBS_AST_Declarations_Class;
+VALUE RBS_AST_Declarations_Class_Super;
+VALUE RBS_AST_Declarations_ClassAlias;
 VALUE RBS_AST_Declarations_Constant;
 VALUE RBS_AST_Declarations_Global;
 VALUE RBS_AST_Declarations_Interface;
 VALUE RBS_AST_Declarations_Module;
 VALUE RBS_AST_Declarations_Module_Self;
-VALUE RBS_AST_Declarations_Class;
-VALUE RBS_AST_Declarations_Class_Super;
 VALUE RBS_AST_Declarations_ModuleAlias;
-VALUE RBS_AST_Declarations_ClassAlias;
-
-VALUE RBS_AST_Directives;
+VALUE RBS_AST_Declarations_TypeAlias;
 VALUE RBS_AST_Directives_Use;
 VALUE RBS_AST_Directives_Use_SingleClause;
 VALUE RBS_AST_Directives_Use_WildcardClause;
-
-VALUE RBS_AST_Members;
 VALUE RBS_AST_Members_Alias;
 VALUE RBS_AST_Members_AttrAccessor;
 VALUE RBS_AST_Members_AttrReader;
@@ -41,10 +47,10 @@ VALUE RBS_AST_Members_MethodDefinition_Overload;
 VALUE RBS_AST_Members_Prepend;
 VALUE RBS_AST_Members_Private;
 VALUE RBS_AST_Members_Public;
-
+VALUE RBS_AST_TypeParam;
+VALUE RBS_MethodType;
 VALUE RBS_Namespace;
 VALUE RBS_TypeName;
-
 VALUE RBS_Types_Alias;
 VALUE RBS_Types_Bases_Any;
 VALUE RBS_Types_Bases_Bool;
@@ -55,13 +61,11 @@ VALUE RBS_Types_Bases_Nil;
 VALUE RBS_Types_Bases_Self;
 VALUE RBS_Types_Bases_Top;
 VALUE RBS_Types_Bases_Void;
-VALUE RBS_Types_Bases;
 VALUE RBS_Types_Block;
 VALUE RBS_Types_ClassInstance;
 VALUE RBS_Types_ClassSingleton;
-VALUE RBS_Types_Function_Param;
 VALUE RBS_Types_Function;
-VALUE RBS_Types_UntypedFunction;
+VALUE RBS_Types_Function_Param;
 VALUE RBS_Types_Interface;
 VALUE RBS_Types_Intersection;
 VALUE RBS_Types_Literal;
@@ -70,9 +74,8 @@ VALUE RBS_Types_Proc;
 VALUE RBS_Types_Record;
 VALUE RBS_Types_Tuple;
 VALUE RBS_Types_Union;
+VALUE RBS_Types_UntypedFunction;
 VALUE RBS_Types_Variable;
-VALUE RBS_Types;
-VALUE RBS_MethodType;
 
 VALUE RBS_ParsingError;
 
@@ -83,29 +86,27 @@ void rbs__init_constants(void) {
   IMPORT_CONSTANT(RBS_ParsingError, RBS, "ParsingError");
 
   IMPORT_CONSTANT(RBS_AST, RBS, "AST");
-  IMPORT_CONSTANT(RBS_AST_Comment, RBS_AST, "Comment");
-  IMPORT_CONSTANT(RBS_AST_Annotation, RBS_AST, "Annotation");
-  IMPORT_CONSTANT(RBS_AST_TypeParam, RBS_AST, "TypeParam");
-
   IMPORT_CONSTANT(RBS_AST_Declarations, RBS_AST, "Declarations");
+  IMPORT_CONSTANT(RBS_AST_Directives, RBS_AST, "Directives");
+  IMPORT_CONSTANT(RBS_AST_Members, RBS_AST, "Members");
+  IMPORT_CONSTANT(RBS_Types, RBS, "Types");
+  IMPORT_CONSTANT(RBS_Types_Bases, RBS_Types, "Bases");
 
-  IMPORT_CONSTANT(RBS_AST_Declarations_TypeAlias, RBS_AST_Declarations, "TypeAlias");
+  IMPORT_CONSTANT(RBS_AST_Annotation, RBS_AST, "Annotation");
+  IMPORT_CONSTANT(RBS_AST_Comment, RBS_AST, "Comment");
+  IMPORT_CONSTANT(RBS_AST_Declarations_Class, RBS_AST_Declarations, "Class");
+  IMPORT_CONSTANT(RBS_AST_Declarations_Class_Super, RBS_AST_Declarations_Class, "Super");
+  IMPORT_CONSTANT(RBS_AST_Declarations_ClassAlias, RBS_AST_Declarations, "ClassAlias");
   IMPORT_CONSTANT(RBS_AST_Declarations_Constant, RBS_AST_Declarations, "Constant");
   IMPORT_CONSTANT(RBS_AST_Declarations_Global, RBS_AST_Declarations, "Global");
   IMPORT_CONSTANT(RBS_AST_Declarations_Interface, RBS_AST_Declarations, "Interface");
   IMPORT_CONSTANT(RBS_AST_Declarations_Module, RBS_AST_Declarations, "Module");
   IMPORT_CONSTANT(RBS_AST_Declarations_Module_Self, RBS_AST_Declarations_Module, "Self");
-  IMPORT_CONSTANT(RBS_AST_Declarations_Class, RBS_AST_Declarations, "Class");
-  IMPORT_CONSTANT(RBS_AST_Declarations_Class_Super, RBS_AST_Declarations_Class, "Super");
-  IMPORT_CONSTANT(RBS_AST_Declarations_ClassAlias, RBS_AST_Declarations, "ClassAlias");
   IMPORT_CONSTANT(RBS_AST_Declarations_ModuleAlias, RBS_AST_Declarations, "ModuleAlias");
-
-  IMPORT_CONSTANT(RBS_AST_Directives, RBS_AST, "Directives");
+  IMPORT_CONSTANT(RBS_AST_Declarations_TypeAlias, RBS_AST_Declarations, "TypeAlias");
   IMPORT_CONSTANT(RBS_AST_Directives_Use, RBS_AST_Directives, "Use");
   IMPORT_CONSTANT(RBS_AST_Directives_Use_SingleClause, RBS_AST_Directives_Use, "SingleClause");
   IMPORT_CONSTANT(RBS_AST_Directives_Use_WildcardClause, RBS_AST_Directives_Use, "WildcardClause");
-
-  IMPORT_CONSTANT(RBS_AST_Members, RBS_AST, "Members");
   IMPORT_CONSTANT(RBS_AST_Members_Alias, RBS_AST_Members, "Alias");
   IMPORT_CONSTANT(RBS_AST_Members_AttrAccessor, RBS_AST_Members, "AttrAccessor");
   IMPORT_CONSTANT(RBS_AST_Members_AttrReader, RBS_AST_Members, "AttrReader");
@@ -120,12 +121,11 @@ void rbs__init_constants(void) {
   IMPORT_CONSTANT(RBS_AST_Members_Prepend, RBS_AST_Members, "Prepend");
   IMPORT_CONSTANT(RBS_AST_Members_Private, RBS_AST_Members, "Private");
   IMPORT_CONSTANT(RBS_AST_Members_Public, RBS_AST_Members, "Public");
-
+  IMPORT_CONSTANT(RBS_AST_TypeParam, RBS_AST, "TypeParam");
+  IMPORT_CONSTANT(RBS_MethodType, RBS, "MethodType");
   IMPORT_CONSTANT(RBS_Namespace, RBS, "Namespace");
   IMPORT_CONSTANT(RBS_TypeName, RBS, "TypeName");
-  IMPORT_CONSTANT(RBS_Types, RBS, "Types");
   IMPORT_CONSTANT(RBS_Types_Alias, RBS_Types, "Alias");
-  IMPORT_CONSTANT(RBS_Types_Bases, RBS_Types, "Bases");
   IMPORT_CONSTANT(RBS_Types_Bases_Any, RBS_Types_Bases, "Any");
   IMPORT_CONSTANT(RBS_Types_Bases_Bool, RBS_Types_Bases, "Bool");
   IMPORT_CONSTANT(RBS_Types_Bases_Bottom, RBS_Types_Bases, "Bottom");
@@ -139,7 +139,6 @@ void rbs__init_constants(void) {
   IMPORT_CONSTANT(RBS_Types_ClassInstance, RBS_Types, "ClassInstance");
   IMPORT_CONSTANT(RBS_Types_ClassSingleton, RBS_Types, "ClassSingleton");
   IMPORT_CONSTANT(RBS_Types_Function, RBS_Types, "Function");
-  IMPORT_CONSTANT(RBS_Types_UntypedFunction, RBS_Types, "UntypedFunction");
   IMPORT_CONSTANT(RBS_Types_Function_Param, RBS_Types_Function, "Param");
   IMPORT_CONSTANT(RBS_Types_Interface, RBS_Types, "Interface");
   IMPORT_CONSTANT(RBS_Types_Intersection, RBS_Types, "Intersection");
@@ -149,6 +148,6 @@ void rbs__init_constants(void) {
   IMPORT_CONSTANT(RBS_Types_Record, RBS_Types, "Record");
   IMPORT_CONSTANT(RBS_Types_Tuple, RBS_Types, "Tuple");
   IMPORT_CONSTANT(RBS_Types_Union, RBS_Types, "Union");
+  IMPORT_CONSTANT(RBS_Types_UntypedFunction, RBS_Types, "UntypedFunction");
   IMPORT_CONSTANT(RBS_Types_Variable, RBS_Types, "Variable");
-  IMPORT_CONSTANT(RBS_MethodType, RBS, "MethodType");
 }