rbs 1.7.0.beta.2 → 1.7.0.beta.3

data/ext/rbs_extension/ruby_objs.c

@@ -1,15 +1,23 @@
 #include "rbs_extension.h"
 
+#ifdef RB_PASS_KEYWORDS
+  // Ruby 2.7 or later
+  #define CLASS_NEW_INSTANCE(klass, argc, argv)\
+          rb_class_new_instance_kw(argc, argv, klass, RB_PASS_KEYWORDS)
+#else
+  // Ruby 2.6
+  #define CLASS_NEW_INSTANCE(receiver, argc, argv)\
+          rb_class_new_instance(argc, argv, receiver)
+#endif
+
 VALUE rbs_base_type(VALUE klass, VALUE location) {
   VALUE args = rb_hash_new();
   rb_hash_aset(args, ID2SYM(rb_intern("location")), location);
 
-  return rb_funcallv_kw(
+  return CLASS_NEW_INSTANCE(
     klass,
-    rb_intern("new"),
     1,
-    &args,
-    RB_PASS_KEYWORDS
+    &args
   );
 }
 
@@ -18,12 +26,10 @@ VALUE rbs_namespace(VALUE path, VALUE absolute) {
   rb_hash_aset(args, ID2SYM(rb_intern("path")), path);
   rb_hash_aset(args, ID2SYM(rb_intern("absolute")), absolute);
 
-  return rb_funcallv_kw(
+  return CLASS_NEW_INSTANCE(
     RBS_Namespace,
-    rb_intern("new"),
     1,
-    &args,
-    RB_PASS_KEYWORDS
+    &args
   );
 }
 
@@ -32,12 +38,10 @@ VALUE rbs_type_name(VALUE namespace, VALUE name) {
   rb_hash_aset(args, ID2SYM(rb_intern("namespace")), namespace);
   rb_hash_aset(args, ID2SYM(rb_intern("name")), name);
 
-  return rb_funcallv_kw(
+  return CLASS_NEW_INSTANCE(
     RBS_TypeName,
-    rb_intern("new"),
     1,
-    &args,
-    RB_PASS_KEYWORDS
+    &args
   );
 }
 
@@ -47,12 +51,10 @@ VALUE rbs_class_instance(VALUE typename, VALUE type_args, VALUE location) {
   rb_hash_aset(args, ID2SYM(rb_intern("args")), type_args);
   rb_hash_aset(args, ID2SYM(rb_intern("location")), location);
 
-  return rb_funcallv_kw(
+  return CLASS_NEW_INSTANCE(
     RBS_Types_ClassInstance,
-    rb_intern("new"),
     1,
-    &args,
-    RB_PASS_KEYWORDS
+    &args
   );
 }
 
@@ -61,12 +63,10 @@ VALUE rbs_class_singleton(VALUE typename, VALUE location) {
   rb_hash_aset(args, ID2SYM(rb_intern("name")), typename);
   rb_hash_aset(args, ID2SYM(rb_intern("location")), location);
 
-  return rb_funcallv_kw(
+  return CLASS_NEW_INSTANCE(
     RBS_Types_ClassSingleton,
-    rb_intern("new"),
     1,
-    &args,
-    RB_PASS_KEYWORDS
+    &args
   );
 }
 
@@ -75,12 +75,10 @@ VALUE rbs_alias(VALUE typename, VALUE location) {
   rb_hash_aset(args, ID2SYM(rb_intern("name")), typename);
   rb_hash_aset(args, ID2SYM(rb_intern("location")), location);
 
-  return rb_funcallv_kw(
+  return CLASS_NEW_INSTANCE(
     RBS_Types_Alias,
-    rb_intern("new"),
     1,
-    &args,
-    RB_PASS_KEYWORDS
+    &args
   );
 }
 
@@ -90,12 +88,10 @@ VALUE rbs_interface(VALUE typename, VALUE type_args, VALUE location) {
   rb_hash_aset(args, ID2SYM(rb_intern("args")), type_args);
   rb_hash_aset(args, ID2SYM(rb_intern("location")), location);
 
-  return rb_funcallv_kw(
+  return CLASS_NEW_INSTANCE(
     RBS_Types_Interface,
-    rb_intern("new"),
     1,
-    &args,
-    RB_PASS_KEYWORDS
+    &args
   );
 }
 
@@ -104,12 +100,10 @@ VALUE rbs_union(VALUE types, VALUE location) {
   rb_hash_aset(args, ID2SYM(rb_intern("types")), types);
   rb_hash_aset(args, ID2SYM(rb_intern("location")), location);
 
-  return rb_funcallv_kw(
+  return CLASS_NEW_INSTANCE(
     RBS_Types_Union,
-    rb_intern("new"),
     1,
-    &args,
-    RB_PASS_KEYWORDS
+    &args
   );
 }
 
@@ -118,12 +112,10 @@ VALUE rbs_intersection(VALUE types, VALUE location) {
   rb_hash_aset(args, ID2SYM(rb_intern("types")), types);
   rb_hash_aset(args, ID2SYM(rb_intern("location")), location);
 
-  return rb_funcallv_kw(
+  return CLASS_NEW_INSTANCE(
     RBS_Types_Intersection,
-    rb_intern("new"),
     1,
-    &args,
-    RB_PASS_KEYWORDS
+    &args
   );
 }
 
@@ -132,12 +124,10 @@ VALUE rbs_tuple(VALUE types, VALUE location) {
   rb_hash_aset(args, ID2SYM(rb_intern("types")), types);
   rb_hash_aset(args, ID2SYM(rb_intern("location")), location);
 
-  return rb_funcallv_kw(
+  return CLASS_NEW_INSTANCE(
     RBS_Types_Tuple,
-    rb_intern("new"),
     1,
-    &args,
-    RB_PASS_KEYWORDS
+    &args
   );
 }
 
@@ -146,12 +136,10 @@ VALUE rbs_optional(VALUE type, VALUE location) {
   rb_hash_aset(args, ID2SYM(rb_intern("type")), type);
   rb_hash_aset(args, ID2SYM(rb_intern("location")), location);
 
-  return rb_funcallv_kw(
+  return CLASS_NEW_INSTANCE(
     RBS_Types_Optional,
-    rb_intern("new"),
     1,
-    &args,
-    RB_PASS_KEYWORDS
+    &args
   );
 }
 
@@ -160,12 +148,10 @@ VALUE rbs_block(VALUE type, VALUE required) {
   rb_hash_aset(args, ID2SYM(rb_intern("type")), type);
   rb_hash_aset(args, ID2SYM(rb_intern("required")), required);
 
-  return rb_funcallv_kw(
+  return CLASS_NEW_INSTANCE(
     RBS_Types_Block,
-    rb_intern("new"),
     1,
-    &args,
-    RB_PASS_KEYWORDS
+    &args
   );
 }
 
@@ -175,12 +161,10 @@ VALUE rbs_function_param(VALUE type, VALUE name, VALUE location) {
   rb_hash_aset(args, ID2SYM(rb_intern("name")), name);
   rb_hash_aset(args, ID2SYM(rb_intern("location")), location);
 
-  return rb_funcallv_kw(
+  return CLASS_NEW_INSTANCE(
     RBS_Types_Function_Param,
-    rb_intern("new"),
     1,
-    &args,
-    RB_PASS_KEYWORDS
+    &args
   );
 }
 
@@ -204,12 +188,10 @@ VALUE rbs_function(
   rb_hash_aset(args, ID2SYM(rb_intern("rest_keywords")), rest_keyword_param);
   rb_hash_aset(args, ID2SYM(rb_intern("return_type")), return_type);
 
-  return rb_funcallv_kw(
+  return CLASS_NEW_INSTANCE(
     RBS_Types_Function,
-    rb_intern("new"),
     1,
-    &args,
-    RB_PASS_KEYWORDS
+    &args
   );
 }
 
@@ -219,12 +201,10 @@ VALUE rbs_proc(VALUE function, VALUE block, VALUE location) {
   rb_hash_aset(args, ID2SYM(rb_intern("block")), block);
   rb_hash_aset(args, ID2SYM(rb_intern("location")), location);
 
-  return rb_funcallv_kw(
+  return CLASS_NEW_INSTANCE(
     RBS_Types_Proc,
-    rb_intern("new"),
     1,
-    &args,
-    RB_PASS_KEYWORDS
+    &args
   );
 }
 
@@ -232,12 +212,10 @@ VALUE rbs_void(VALUE location) {
   VALUE args = rb_hash_new();
   rb_hash_aset(args, ID2SYM(rb_intern("location")), location);
 
-  return rb_funcallv_kw(
+  return CLASS_NEW_INSTANCE(
     RBS_Types_Bases_Void,
-    rb_intern("new"),
     1,
-    &args,
-    RB_PASS_KEYWORDS
+    &args
   );
 }
 
@@ -246,12 +224,10 @@ VALUE rbs_literal(VALUE literal, VALUE location) {
   rb_hash_aset(args, ID2SYM(rb_intern("location")), location);
   rb_hash_aset(args, ID2SYM(rb_intern("literal")), literal);
 
-  return rb_funcallv_kw(
+  return CLASS_NEW_INSTANCE(
     RBS_Types_Literal,
-    rb_intern("new"),
     1,
-    &args,
-    RB_PASS_KEYWORDS
+    &args
   );
 }
 
@@ -260,12 +236,10 @@ VALUE rbs_record(VALUE fields, VALUE location) {
   rb_hash_aset(args, ID2SYM(rb_intern("location")), location);
   rb_hash_aset(args, ID2SYM(rb_intern("fields")), fields);
 
-  return rb_funcallv_kw(
+  return CLASS_NEW_INSTANCE(
     RBS_Types_Record,
-    rb_intern("new"),
     1,
-    &args,
-    RB_PASS_KEYWORDS
+    &args
   );
 }
 
@@ -274,12 +248,10 @@ VALUE rbs_variable(VALUE name, VALUE location) {
   rb_hash_aset(args, ID2SYM(rb_intern("location")), location);
   rb_hash_aset(args, ID2SYM(rb_intern("name")), name);
 
-  return rb_funcallv_kw(
+  return CLASS_NEW_INSTANCE(
     RBS_Types_Variable,
-    rb_intern("new"),
     1,
-    &args,
-    RB_PASS_KEYWORDS
+    &args
   );
 }
 
@@ -290,12 +262,10 @@ VALUE rbs_method_type(VALUE type_params, VALUE type, VALUE block, VALUE location
   rb_hash_aset(args, ID2SYM(rb_intern("block")), block);
   rb_hash_aset(args, ID2SYM(rb_intern("location")), location);
 
-  return rb_funcallv_kw(
+  return CLASS_NEW_INSTANCE(
     RBS_MethodType,
-    rb_intern("new"),
     1,
-    &args,
-    RB_PASS_KEYWORDS
+    &args
   );
 }
 
@@ -304,12 +274,10 @@ VALUE rbs_ast_comment(VALUE string, VALUE location) {
   rb_hash_aset(args, ID2SYM(rb_intern("string")), string);
   rb_hash_aset(args, ID2SYM(rb_intern("location")), location);
 
-  return rb_funcallv_kw(
+  return CLASS_NEW_INSTANCE(
     RBS_AST_Comment,
-    rb_intern("new"),
     1,
-    &args,
-    RB_PASS_KEYWORDS
+    &args
   );
 }
 
@@ -318,12 +286,10 @@ VALUE rbs_ast_annotation(VALUE string, VALUE location) {
   rb_hash_aset(args, ID2SYM(rb_intern("string")), string);
   rb_hash_aset(args, ID2SYM(rb_intern("location")), location);
 
-  return rb_funcallv_kw(
+  return CLASS_NEW_INSTANCE(
     RBS_AST_Annotation,
-    rb_intern("new"),
     1,
-    &args,
-    RB_PASS_KEYWORDS
+    &args
   );
 }
 
@@ -338,12 +304,10 @@ VALUE rbs_ast_decl_module_type_params_param(VALUE name, VALUE variance, VALUE sk
   rb_hash_aset(args, ID2SYM(rb_intern("skip_validation")), skip_validation);
   rb_hash_aset(args, ID2SYM(rb_intern("location")), location);
 
-  return rb_funcallv_kw(
+  return CLASS_NEW_INSTANCE(
     RBS_AST_Declarations_ModuleTypeParams_TypeParam,
-    rb_intern("new"),
     1,
-    &args,
-    RB_PASS_KEYWORDS
+    &args
   );
 }
 
@@ -354,12 +318,10 @@ VALUE rbs_ast_decl_constant(VALUE name, VALUE type, VALUE location, VALUE commen
   rb_hash_aset(args, ID2SYM(rb_intern("location")), location);
   rb_hash_aset(args, ID2SYM(rb_intern("comment")), comment);
 
-  return rb_funcallv_kw(
+  return CLASS_NEW_INSTANCE(
     RBS_AST_Declarations_Constant,
-    rb_intern("new"),
     1,
-    &args,
-    RB_PASS_KEYWORDS
+    &args
   );
 }
 
@@ -370,12 +332,10 @@ VALUE rbs_ast_decl_global(VALUE name, VALUE type, VALUE location, VALUE comment)
   rb_hash_aset(args, ID2SYM(rb_intern("location")), location);
   rb_hash_aset(args, ID2SYM(rb_intern("comment")), comment);
 
-  return rb_funcallv_kw(
+  return CLASS_NEW_INSTANCE(
     RBS_AST_Declarations_Global,
-    rb_intern("new"),
     1,
-    &args,
-    RB_PASS_KEYWORDS
+    &args
   );
 }
 
@@ -387,12 +347,10 @@ VALUE rbs_ast_decl_alias(VALUE name, VALUE type, VALUE annotations, VALUE locati
   rb_hash_aset(args, ID2SYM(rb_intern("location")), location);
   rb_hash_aset(args, ID2SYM(rb_intern("comment")), comment);
 
-  return rb_funcallv_kw(
+  return CLASS_NEW_INSTANCE(
     RBS_AST_Declarations_Alias,
-    rb_intern("new"),
     1,
-    &args,
-    RB_PASS_KEYWORDS
+    &args
   );
 }
 
@@ -405,12 +363,10 @@ VALUE rbs_ast_decl_interface(VALUE name, VALUE type_params, VALUE members, VALUE
   rb_hash_aset(args, ID2SYM(rb_intern("location")), location);
   rb_hash_aset(args, ID2SYM(rb_intern("comment")), comment);
 
-  return rb_funcallv_kw(
+  return CLASS_NEW_INSTANCE(
     RBS_AST_Declarations_Interface,
-    rb_intern("new"),
     1,
-    &args,
-    RB_PASS_KEYWORDS
+    &args
   );
 }
 
@@ -420,12 +376,10 @@ VALUE rbs_ast_decl_module_self(VALUE name, VALUE args, VALUE location) {
   rb_hash_aset(kw_args, ID2SYM(rb_intern("args")), args);
   rb_hash_aset(kw_args, ID2SYM(rb_intern("location")), location);
 
-  return rb_funcallv_kw(
+  return CLASS_NEW_INSTANCE(
     RBS_AST_Declarations_Module_Self,
-    rb_intern("new"),
     1,
-    &kw_args,
-    RB_PASS_KEYWORDS
+    &kw_args
   );
 }
 
@@ -439,12 +393,10 @@ VALUE rbs_ast_decl_module(VALUE name, VALUE type_params, VALUE self_types, VALUE
   rb_hash_aset(args, ID2SYM(rb_intern("location")), location);
   rb_hash_aset(args, ID2SYM(rb_intern("comment")), comment);
 
-  return rb_funcallv_kw(
+  return CLASS_NEW_INSTANCE(
     RBS_AST_Declarations_Module,
-    rb_intern("new"),
     1,
-    &args,
-    RB_PASS_KEYWORDS
+    &args
   );
 }
 
@@ -458,12 +410,10 @@ VALUE rbs_ast_members_method_definition(VALUE name, VALUE kind, VALUE types, VAL
   rb_hash_aset(args, ID2SYM(rb_intern("comment")), comment);
   rb_hash_aset(args, ID2SYM(rb_intern("overload")), overload);
 
-  return rb_funcallv_kw(
+  return CLASS_NEW_INSTANCE(
     RBS_AST_Members_MethodDefinition,
-    rb_intern("new"),
     1,
-    &args,
-    RB_PASS_KEYWORDS
+    &args
   );
 }
 
@@ -474,12 +424,10 @@ VALUE rbs_ast_members_variable(VALUE klass, VALUE name, VALUE type, VALUE locati
   rb_hash_aset(args, ID2SYM(rb_intern("location")), location);
   rb_hash_aset(args, ID2SYM(rb_intern("comment")), comment);
 
-  return rb_funcallv_kw(
+  return CLASS_NEW_INSTANCE(
     klass,
-    rb_intern("new"),
     1,
-    &args,
-    RB_PASS_KEYWORDS
+    &args
   );
 }
 
@@ -491,12 +439,10 @@ VALUE rbs_ast_members_mixin(VALUE klass, VALUE name, VALUE module_args, VALUE an
   rb_hash_aset(args, ID2SYM(rb_intern("location")), location);
   rb_hash_aset(args, ID2SYM(rb_intern("comment")), comment);
 
-  return rb_funcallv_kw(
+  return CLASS_NEW_INSTANCE(
     klass,
-    rb_intern("new"),
     1,
-    &args,
-    RB_PASS_KEYWORDS
+    &args
   );
 }
 
@@ -510,12 +456,10 @@ VALUE rbs_ast_members_attribute(VALUE klass, VALUE name, VALUE type, VALUE ivar_
   rb_hash_aset(args, ID2SYM(rb_intern("location")), location);
   rb_hash_aset(args, ID2SYM(rb_intern("comment")), comment);
 
-  return rb_funcallv_kw(
+  return CLASS_NEW_INSTANCE(
     klass,
-    rb_intern("new"),
     1,
-    &args,
-    RB_PASS_KEYWORDS
+    &args
   );
 }
 
@@ -523,12 +467,10 @@ VALUE rbs_ast_members_visibility(VALUE klass, VALUE location) {
   VALUE args = rb_hash_new();
   rb_hash_aset(args, ID2SYM(rb_intern("location")), location);
 
-  return rb_funcallv_kw(
+  return CLASS_NEW_INSTANCE(
     klass,
-    rb_intern("new"),
     1,
-    &args,
-    RB_PASS_KEYWORDS
+    &args
   );
 }
 
@@ -541,12 +483,10 @@ VALUE rbs_ast_members_alias(VALUE new_name, VALUE old_name, VALUE kind, VALUE an
   rb_hash_aset(args, ID2SYM(rb_intern("location")), location);
   rb_hash_aset(args, ID2SYM(rb_intern("comment")), comment);
 
-  return rb_funcallv_kw(
+  return CLASS_NEW_INSTANCE(
     RBS_AST_Members_Alias,
-    rb_intern("new"),
     1,
-    &args,
-    RB_PASS_KEYWORDS
+    &args
   );
 }
 
@@ -556,12 +496,10 @@ VALUE rbs_ast_decl_class_super(VALUE name, VALUE args, VALUE location) {
   rb_hash_aset(kwargs, ID2SYM(rb_intern("args")), args);
   rb_hash_aset(kwargs, ID2SYM(rb_intern("location")), location);
 
-  return rb_funcallv_kw(
+  return CLASS_NEW_INSTANCE(
     RBS_AST_Declarations_Class_Super,
-    rb_intern("new"),
     1,
-    &kwargs,
-    RB_PASS_KEYWORDS
+    &kwargs
   );
 }
 
@@ -575,11 +513,9 @@ VALUE rbs_ast_decl_class(VALUE name, VALUE type_params, VALUE super_class, VALUE
   rb_hash_aset(kwargs, ID2SYM(rb_intern("location")), location);
   rb_hash_aset(kwargs, ID2SYM(rb_intern("comment")), comment);
 
-  return rb_funcallv_kw(
+  return CLASS_NEW_INSTANCE(
     RBS_AST_Declarations_Class,
-    rb_intern("new"),
     1,
-    &kwargs,
-    RB_PASS_KEYWORDS
+    &kwargs
   );
 }

data/lib/rbs/collection/installer.rb

@@ -11,6 +11,7 @@ module RBS
 
       def install_from_lockfile
         install_to = lockfile.repo_path
+        install_to.mkpath
         lockfile.gems.each do |config_entry|
           source_for(config_entry).install(dest: install_to, config_entry: config_entry, stdout: stdout)
         end

data/lib/rbs/errors.rb

@@ -32,10 +32,16 @@ module RBS
     end
 
     def error_value
+      RBS.print_warning {
+        "#{self.class.name}#error_value is deprecated and will be deleted in RBS 2.0. Consider using `location.source` instead."
+      }
       location.source
     end
 
     def token_str
+      RBS.print_warning {
+        "#{self.class.name}#token_str is deprecated and will be deleted in RBS 2.0. Consider using `token_type` instead."
+      }
       token_type
     end
   end

data/lib/rbs/parser_aux.rb

@@ -21,11 +21,43 @@ module RBS
       end
     end
 
-    SyntaxError = ParsingError
-    SemanticsError = ParsingError
-    LexerError = ParsingError
+    autoload :SyntaxError, "rbs/parser_compat/syntax_error"
+    autoload :SemanticsError, "rbs/parser_compat/semantics_error"
+    autoload :LexerError, "rbs/parser_compat/lexer_error"
+    autoload :LocatedValue, "rbs/parser_compat/located_value"
 
-    class LocatedValue
-    end
+    KEYWORDS = Set.new(
+      %w(
+        bool
+        bot
+        class
+        instance
+        interface
+        nil
+        self
+        singleton
+        top
+        void
+        type
+        unchecked
+        in
+        out
+        end
+        def
+        include
+        extend
+        prepend
+        alias
+        module
+        attr_reader
+        attr_writer
+        attr_accessor
+        public
+        private
+        untyped
+        true
+        false
+      )
+    )
   end
 end

data/lib/rbs/parser_compat/lexer_error.rb

@@ -0,0 +1,4 @@
+RBS.print_warning {
+  "RBS::Parser::LexerError is deprecated and will be deleted in RBS 2.0."
+}
+RBS::Parser::LexerError = RBS::ParsingError

data/lib/rbs/parser_compat/located_value.rb

@@ -0,0 +1,5 @@
+RBS.print_warning {
+  "RBS::Parser::LocatedValue is deprecated and will be deleted in RBS 2.0."
+}
+class RBS::Parser::LocatedValue
+end

data/lib/rbs/parser_compat/semantics_error.rb

@@ -0,0 +1,4 @@
+RBS.print_warning {
+  "RBS::Parser::SemanticsError is deprecated and will be deleted in RBS 2.0."
+}
+RBS::Parser::SemanticsError = RBS::ParsingError

data/lib/rbs/parser_compat/syntax_error.rb

@@ -0,0 +1,4 @@
+RBS.print_warning {
+  "RBS::Parser::SyntaxError is deprecated and will be deleted in RBS 2.0."
+}
+RBS::Parser::SyntaxError = RBS::ParsingError

data/lib/rbs/types.rb

@@ -433,7 +433,7 @@ module RBS
         return "{ }" if self.fields.empty?
 
         fields = self.fields.map do |key, type|
-          if key.is_a?(Symbol) && key.match?(/\A[A-Za-z_][A-Za-z_]*\z/) && !Parser::KEYWORDS.key?(key)
+          if key.is_a?(Symbol) && key.match?(/\A[A-Za-z_][A-Za-z_]*\z/) && !Parser::KEYWORDS.include?(key)
             "#{key}: #{type}"
           else
             "#{key.inspect} => #{type}"
@@ -690,7 +690,7 @@ module RBS
 
         def to_s
           if name
-            if Parser::KEYWORDS.key?(name)
+            if Parser::KEYWORDS.include?(name)
               "#{type} `#{name}`"
             else
               "#{type} #{name}"

data/lib/rbs/version.rb

@@ -1,3 +1,3 @@
 module RBS
-  VERSION = "1.7.0.beta.2"
+  VERSION = "1.7.0.beta.3"
 end

data/lib/rbs.rb

@@ -68,5 +68,16 @@ module RBS
       @logger_level = level
       @logger = nil
     end
+
+    def print_warning()
+      @warnings ||= Set[]
+
+      message = yield()
+
+      unless @warnings.include?(message)
+        @warnings << message
+        logger.warn { message }
+      end
+    end
   end
 end