rbs 0.12.0 → 0.14.0

data/lib/rbs/parser.y

@@ -1,5 +1,6 @@
 class RBS::Parser
-  token tUIDENT tLIDENT tNAMESPACE tINTERFACEIDENT tLKEYWORD tUKEYWORD tGLOBALIDENT
+  token tUIDENT tLIDENT tNAMESPACE tINTERFACEIDENT tGLOBALIDENT
+        tLKEYWORD tUKEYWORD tLKEYWORD_Q_E tUKEYWORD_Q_E
         tIVAR tCLASSVAR
         tANNOTATION
         tSTRING tSYMBOL tINTEGER tWRITE_ATTR
@@ -846,7 +847,7 @@ rule
         result = val[0]
       }
 
-  keyword: tLKEYWORD | tUKEYWORD
+  keyword: tLKEYWORD | tUKEYWORD | tLKEYWORD_Q_E | tUKEYWORD_Q_E
 
   function_type:
       kLPAREN params kRPAREN kARROW simple_type {
@@ -1344,8 +1345,12 @@ def next_token
     new_token(:tNAMESPACE)
   when input.scan(/[a-z_]\w*:/)
     new_token(:tLKEYWORD, input.matched.chop.to_sym)
+  when input.scan(/[a-z_]\w*[?!]:/)
+    new_token(:tLKEYWORD_Q_E, input.matched.chop.to_sym)
   when input.scan(/[A-Z]\w*:/)
     new_token(:tUKEYWORD, input.matched.chop.to_sym)
+  when input.scan(/[A-Z]\w*[?!]:/)
+    new_token(:tUKEYWORD_Q_E, input.matched.chop.to_sym)
   when input.scan(/\$[A-Za-z_]\w*/)
     new_token(:tGLOBALIDENT)
   when input.scan(/@[a-zA-Z_]\w*/)

data/lib/rbs/test/setup_helper.rb

@@ -3,15 +3,15 @@ module RBS
     module SetupHelper
       class InvalidSampleSizeError < StandardError
         attr_reader :string
-        
+
         def initialize(string)
           @string = string
           super("Sample size should be a positive integer: `#{string}`")
         end
       end
-      
+
       DEFAULT_SAMPLE_SIZE = 100
-      
+
       def get_sample_size(string)
         case string
         when ""
@@ -32,7 +32,7 @@ module RBS
         when 'rspec'
           ['::RSpec::Mocks::Double']
         when 'minitest'
-          ['::Minitest::Mock'] 
+          ['::Minitest::Mock']
         else
           RBS.logger.warn "Unknown test suite - defaults to nil"
           nil

data/lib/rbs/test/type_check.rb

@@ -212,7 +212,7 @@ module RBS
       def value(val, type)
         if is_double?(val)
           RBS.logger.info("A double (#{val.inspect}) is detected!")
-          return true 
+          return true
         end
 
         case type
@@ -306,7 +306,7 @@ module RBS
           Test.call(val, IS_AP, ::Array) &&
             type.types.map.with_index {|ty, index| value(val[index], ty) }.all?
         when Types::Record
-          Test::call(val, IS_AP, ::Hash) && 
+          Test::call(val, IS_AP, ::Hash) &&
             type.fields.map {|key, type| value(val[key], type) }.all?
         when Types::Proc
           Test::call(val, IS_AP, ::Proc)

data/lib/rbs/type_name.rb

@@ -23,7 +23,7 @@ module RBS
     def ==(other)
       other.is_a?(self.class) && other.namespace == namespace && other.name == name
     end
-    
+
     alias eql? ==
 
     def hash

data/lib/rbs/variance_calculator.rb

@@ -120,7 +120,7 @@ module RBS
 
         type.args.each.with_index do |ty, i|
           var = type_params.params[i]
-          case var.variance
+          case var&.variance
           when :invariant
             type(ty, result: result, context: :invariant)
           when :covariant
@@ -135,7 +135,7 @@ module RBS
                   when :contravariant
                     :covariant
                   else
-                    raise                    
+                    raise
                   end
             type(ty, result: result, context: con)
           end

data/lib/rbs/version.rb

@@ -1,3 +1,3 @@
 module RBS
-  VERSION = "0.12.0"
+  VERSION = "0.14.0"
 end

data/lib/rbs/writer.rb

@@ -60,6 +60,8 @@ module RBS
 
     def write(decls)
       [nil, *decls].each_cons(2) do |prev, decl|
+        raise unless decl
+
         preserve_empty_line(prev, decl)
         write_decl decl
       end
@@ -68,8 +70,8 @@ module RBS
     def write_decl(decl)
       case decl
       when AST::Declarations::Class
-        super_class = if decl.super_class
-                        " < #{name_and_args(decl.super_class.name, decl.super_class.args)}"
+        super_class = if super_class = decl.super_class
+                        " < #{name_and_args(super_class.name, super_class.args)}"
                       end
         write_comment decl.comment
         write_annotation decl.annotations
@@ -77,6 +79,8 @@ module RBS
 
         indent do
           [nil, *decl.members].each_cons(2) do |prev, member|
+            raise unless member
+
             preserve_empty_line prev, member
             write_member member
           end
@@ -134,9 +138,6 @@ module RBS
 
         puts "end"
 
-      when AST::Declarations::Extension
-        RBS.logger.warn "Extension is ignored: #{decl.name}"
-
       end
     end
 
@@ -288,20 +289,29 @@ module RBS
     end
 
     def preserve_empty_line(prev, decl)
-      return unless prev
+      # @type var decl: _Located
 
-      decl = decl.comment if decl.respond_to?(:comment) && decl.comment
+      return unless prev
 
-      # When the signature is not constructed by the parser,
-      # it always inserts an empty line.
-      if !prev.location || !decl.location
-        puts
-        return
+      if (_ = decl).respond_to?(:comment)
+        if comment = (_ = decl).comment
+          decl = comment
+        end
       end
 
-      prev_end_line = prev.location.end_line
-      start_line = decl.location.start_line
-      if start_line - prev_end_line > 1
+      prev_loc = prev.location
+      decl_loc = decl.location
+
+      if prev_loc && decl_loc
+        prev_end_line = prev_loc.end_line
+        start_line = decl_loc.start_line
+
+        if start_line - prev_end_line > 1
+          puts
+        end
+      else
+        # When the signature is not constructed by the parser,
+        # it always inserts an empty line.
         puts
       end
     end

data/sig/constant.rbs

@@ -0,0 +1,21 @@
+module RBS
+  class Constant
+    type constant_entry = Environment::ClassEntry
+                        | Environment::ModuleEntry
+                        | Environment::SingleEntry[TypeName, AST::Declarations::Constant]
+
+    attr_reader name: TypeName
+
+    attr_reader type: Types::t
+
+    attr_reader entry: constant_entry
+
+    def initialize: (name: TypeName, type: Types::t, entry: constant_entry) -> void
+
+    def ==: (untyped other) -> bool
+
+    alias eql? ==
+
+    def hash: () -> Integer
+  end
+end

data/sig/constant_table.rbs

@@ -0,0 +1,30 @@
+module RBS
+  class ConstantTable
+    attr_reader definition_builder: DefinitionBuilder
+    attr_reader constant_scopes_cache: Hash[TypeName, Array[Namespace]]
+    attr_reader resolver: TypeNameResolver
+    attr_reader env(): Environment
+
+    def initialize: (builder: DefinitionBuilder) -> void
+
+    def absolute_type: (Types::t, context: Array[Namespace]) -> Types::t
+
+    def absolute_type_name: (TypeName, context: Array[Namespace], location: Location?) -> TypeName
+
+    def name_to_constant: (TypeName) -> Constant?
+
+    def split_name: (TypeName) -> Array[Symbol]
+
+    def resolve_constant_reference: (TypeName name, context: Array[Namespace]) -> Constant?
+
+    def resolve_constant_reference_context: (Symbol, context: Array[Namespace]) -> Constant?
+
+    def resolve_constant_reference_inherit: (Symbol, scopes: Array[Namespace], ?no_object: bool) -> Constant?
+
+    def constant_scopes: (TypeName) -> Array[Namespace]
+
+    def constant_scopes_module: (TypeName, scopes: Array[Namespace]) -> Array[Namespace]
+
+    def constant_scopes0: (TypeName, ?scopes: Array[Namespace]) -> Array[Namespace]
+  end
+end

data/sig/declarations.rbs

@@ -2,7 +2,7 @@ module RBS
   module AST
     module Declarations
       type t = Class | Module | Interface | Constant | Global | Alias
-      
+
       class Base
       end
 

data/sig/definition.rbs

@@ -28,7 +28,7 @@ module RBS
         def annotations: () -> Array[AST::Annotation]
 
         def update: (?type: MethodType, ?member: method_member, ?defined_in: TypeName?, ?implemented_in: TypeName?) -> TypeDef
-        
+
         def overload?: () -> bool
       end
 

data/sig/definition_builder.rbs

@@ -29,14 +29,14 @@ module RBS
 
     attr_reader env: Environment
     attr_reader type_name_resolver: TypeNameResolver
-    
+
     attr_reader instance_cache: Hash[TypeName, Definition | false | nil]
     attr_reader singleton_cache: Hash[TypeName, Definition | false | nil]
     attr_reader interface_cache: Hash[TypeName, Definition | false | nil]
 
     attr_reader one_instance_cache: Hash[TypeName, Definition]
     attr_reader one_singleton_cache: Hash[TypeName, Definition]
-    
+
     attr_reader instance_ancestors_cache: Hash[TypeName, Definition::InstanceAncestors]
     attr_reader singleton_ancestor_cache: Hash[TypeName, Definition::SingletonAncestors]
 
@@ -48,7 +48,7 @@ module RBS
     def validate_super_class!: (TypeName, Environment::ClassEntry) -> void
 
     def one_instance_ancestors: (TypeName) -> OneAncestors
-                                
+
     def one_singleton_ancestors: (TypeName) -> OneAncestors
 
     def instance_ancestors: (TypeName, ?building_ancestors: Array[Definition::Ancestor::t]) -> Definition::InstanceAncestors
@@ -69,7 +69,7 @@ module RBS
 
     def build_one_singleton: (TypeName) -> Definition
 
-    def merge_definitions: (TypeName, 
+    def merge_definitions: (TypeName,
                             Array[[Definition::Ancestor::t, Definition]],
                             entry: Environment::ModuleEntry | Environment::ClassEntry,
                             self_type: Definition::self_type,
@@ -92,4 +92,3 @@ module RBS
     def expand_alias: (TypeName) -> Types::t
   end
 end
-

data/sig/environment_loader.rbs

@@ -1,4 +1,58 @@
 module RBS
   class EnvironmentLoader
+    class UnknownLibraryNameError < StandardError
+      attr_reader name: String
+
+      def initialize: (name: String) -> void
+    end
+
+    class LibraryPath
+      attr_reader name: String
+      attr_reader path: Pathname
+
+      def initialize: (name: String, path: Pathname) -> void
+    end
+
+    class GemPath
+      attr_reader name: String
+      attr_reader version: String?
+      attr_reader path: Pathname
+
+      def initialize: (name: String, version: String?, path: Pathname) -> void
+    end
+
+    STDLIB_ROOT: Pathname
+
+    type path = Pathname | LibraryPath | GemPath
+
+    attr_reader paths: Array[path]
+    attr_reader stdlib_root: Pathname
+    attr_reader gem_vendor_path: Pathname?
+
+    def self.gem_sig_path: (String, String?) -> Pathname?
+
+    def initialize: (?stdlib_root: Pathname, ?gem_vendor_path: Pathname?) -> void
+
+    def add: (path: Pathname?) -> void
+           | (library: String?) -> void
+
+    def self.parse_library: (String) -> [String, String?]
+
+    def stdlib?: (String) -> Pathname?
+
+    def gem?: (String, String?) -> Pathname?
+
+    def each_signature: (Pathname, ?immediate: bool) { (Pathname) -> void } -> void
+                      | (Pathname, ?immediate: bool) -> Enumerator[Pathname, void]
+
+    def each_library_path: { (path, Pathname) -> void } -> void
+
+    def no_builtin!: (?bool) -> self
+
+    def no_builtin?: () -> bool
+
+    def each_decl: () { (AST::Declarations::t, Buffer, Pathname, path | :stdlib) -> void } -> void
+
+    def load: (env: Environment) -> Array[[AST::Declarations::t, Pathname, path | :stdlib]]
   end
 end

data/sig/namespace.rbs

@@ -1,6 +1,6 @@
 module RBS
   # Namespace instance represents a _prefix of module names_.
-  # 
+  #
   #    vvvvvvvvvvvvvv  TypeName
   #    RBS::Namespace
   #    ^^^^^           Namespace
@@ -44,7 +44,7 @@ module RBS
     # If `other` is an absolute namespace, it returns `other`.
     #
     #   Namespace("Foo::") + Namespace("::Bar::")  # =>  ::Bar::
-    # 
+    #
     def +: (Namespace other) -> Namespace
 
     # Add one path component to self.
@@ -62,7 +62,7 @@ module RBS
 
     # Returns true if self is absolute namespace.
     def absolute?: () -> bool
-    
+
     # Returns true if self is relative namespace.
     def relative?: () -> bool
 

data/sig/parser.rbs

@@ -0,0 +1,25 @@
+module RBS
+  class Parser
+    class SyntaxError < StandardError
+      attr_reader token_str: String
+      attr_reader error_value: untyped
+      attr_reader value_stack: untyped?
+
+      def initialize: (token_str: String, error_value: untyped, ?value_stack: untyped?) -> void
+    end
+
+    class SemanticsError < StandardError
+      attr_reader subject: untyped
+      attr_reader location: Location
+      attr_reader original_message: String
+
+      def initialize: (String message, subject: untyped, location: Location) -> void
+    end
+
+    def self.parse_method_type: (String | Buffer, ?variables: Array[Symbol], ?eof_re: Regexp?) -> MethodType
+                              
+    def self.parse_type: (String | Buffer, ?variables: Array[Symbol], ?eof_re: Regexp?) -> Types::t
+                       
+    def self.parse_signature: (String | Buffer, ?eof_re: Regexp?) -> Array[AST::Declarations::t]
+  end
+end

data/sig/substitution.rbs

@@ -1,6 +1,6 @@
 module RBS
   # Substitution from type variables to types.
-  # 
+  #
   # The substitution construction is in _destructive_ manner.
   #
   #    sub = Substitution.new
@@ -25,7 +25,7 @@ module RBS
     # Utility method to construct a substitution.
     # Raises an error when `variables.size != types.size`.
     # `instance_type` defaults to `nil`.
-    # 
+    #
     # Yields types in `types` and the block value is used if block is given.
     #
     def self.build: (Array[Symbol] variables, Array[Types::t] types, ?instance_type: Types::t?) ?{ (Types::t) -> Types::t } -> instance
@@ -36,4 +36,4 @@ module RBS
     # Returns a substitution without variables given in `vars`.
     def without: (*Symbol vars) -> Substitution
   end
-end
+end

data/sig/typename.rbs

@@ -1,6 +1,6 @@
 module RBS
   # TypeName represents name of types in RBS.
-  # 
+  #
   # TypeNames are one of the three kind, class, alias, and interface.
   # *class* type names corresponds to Ruby classes and modules.
   # There are no corresponding Ruby value to *alias* and *interface* type names.

data/sig/types.rbs

@@ -154,7 +154,7 @@ module RBS
 
       include NoFreeVariables
       include NoSubst
-      include EmptyEachType      
+      include EmptyEachType
     end
 
     module Application