rbs 2.7.0 → 2.8.0.pre.1

data/lib/rbs/errors.rb

@@ -148,7 +148,27 @@ module RBS
     end
 
     def self.check!(type_name, env:, location:)
-      env.class_decls.key?(type_name) or raise new(type_name: type_name, location: location)
+      if decl = env.class_decls[type_name]
+        return
+      end
+
+      raise new(type_name: type_name, location: location)
+    end
+  end
+
+  class InheritModuleError < DefinitionError
+    attr_reader :super_decl
+
+    def initialize(super_decl)
+      @super_decl = super_decl
+
+      super "#{Location.to_string(super_decl.location)}: Cannot inherit a module: #{super_decl.name}"
+    end
+
+    def self.check!(super_decl, env:)
+      return if env.class_decls[super_decl.name].is_a?(Environment::ClassEntry)
+
+      raise new(super_decl)
     end
   end
 

data/lib/rbs/parser_aux.rb

@@ -2,16 +2,19 @@
 
 module RBS
   class Parser
-    def self.parse_type(source, line: 1, column: 0, variables: [])
-      _parse_type(buffer(source), line, column, variables)
+    def self.parse_type(source, line: nil, column: nil, range: nil, variables: [])
+      buf = buffer(source)
+      _parse_type(buf, range&.begin || 0, range&.end || buf.last_position, variables, range.nil?)
     end
 
-    def self.parse_method_type(source, line: 1, column: 0, variables: [])
-      _parse_method_type(buffer(source), line, column, variables)
+    def self.parse_method_type(source, line: nil, column: nil, range: nil, variables: [])
+      buf = buffer(source)
+      _parse_method_type(buf, range&.begin || 0, range&.end || buf.last_position, variables, range.nil?)
     end
 
-    def self.parse_signature(source, line: 1, column: 0)
-      _parse_signature(buffer(source), line, column)
+    def self.parse_signature(source, line: nil, column: nil)
+      buf = buffer(source)
+      _parse_signature(buf, buf.last_position)
     end
 
     def self.buffer(source)

data/lib/rbs/version.rb

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

data/sig/collection/config.rbs

@@ -24,6 +24,8 @@ module RBS
 
         private
 
+        def validate_gemfile_lock_path!: (lock: Config?, gemfile_lock_path: Pathname) -> void
+
         def assign_gem: (name: String, version: String?) -> void
 
         def upsert_gem: (gem_entry? old, gem_entry new) -> void
@@ -52,6 +54,8 @@ module RBS
 
       @sources: Array[Sources::_Source]
 
+      def self.find_config_path: () -> Pathname?
+
       def self.generate_lockfile: (config_path: Pathname, gemfile_lock_path: Pathname, ?with_lockfile: boolish) -> Config
 
       def self.from_path: (Pathname path) -> Config
@@ -75,6 +79,10 @@ module RBS
 
       def gems: () -> Array[gem_entry]
 
+      def gemfile_lock_path=: (Pathname) -> Pathname
+
+      def gemfile_lock_path: () -> Pathname?
+
       def check_rbs_availability!: () -> void
     end
   end

data/sig/errors.rbs

@@ -197,6 +197,8 @@ module RBS
     def location: () -> Location[untyped, untyped]?
   end
 
+  # MixinClassError is raised if a include/prepend/extend has a class (not a module) to mix-in
+  #
   class MixinClassError < DefinitionError
     type member = AST::Members::Include | AST::Members::Prepend | AST::Members::Extend
 
@@ -212,6 +214,18 @@ module RBS
     def mixin_name: () -> String
   end
 
+  # InheritModuleError is raised if a class definition inherits a module (not a class)
+  #
+  class InheritModuleError < DefinitionError
+    attr_reader super_decl: AST::Declarations::Class::Super
+
+    def initialize: (AST::Declarations::Class::Super) -> void
+
+    def location: () -> Location[untyped, untyped]?
+
+    def self.check!: (AST::Declarations::Class::Super, env: Environment) -> void
+  end
+
   class RecursiveTypeAliasError < BaseError
     attr_reader alias_names: Array[TypeName]
     attr_reader location: Location[untyped, untyped]?

data/sig/manifest.yaml

@@ -4,6 +4,5 @@ dependencies:
   - name: pathname
   - name: json
   - name: optparse
-  - name: rubygems
   - name: tsort
   - name: rdoc

data/sig/parser.rbs

@@ -1,10 +1,43 @@
 module RBS
   class Parser
-    def self.parse_method_type: (Buffer | String, ?line: Integer, ?column: Integer, ?variables: Array[Symbol]) -> MethodType
-
-    def self.parse_type: (Buffer | String, ?line: Integer, ?column: Integer, ?variables: Array[Symbol]) -> Types::t
-
-    def self.parse_signature: (Buffer | String, ?line: Integer, ?column: Integer) -> Array[AST::Declarations::t]
+    # Parse a method type and return it
+    #
+    # When `pos` keyword is specified, skips the first `pos` characters from the input.
+    # If no token is left in the input, it returns `nil`.
+    #
+    # ```ruby
+    # RBS::Parser.parse_method_type("() -> void", range: 0...)                   # => `() -> void`
+    # RBS::Parser.parse_method_type("() -> void () -> String", range: 11...)     # => `() -> String`
+    # RBS::Parser.parse_method_type("() -> void () -> String", range: 23...)     # => nil
+    # ```
+    #
+    # `line` and `column` is deprecated and are ignored.
+    #
+    def self.parse_method_type: (Buffer | String, range: Range[Integer?], ?variables: Array[Symbol]) -> MethodType?
+                              | (Buffer | String, ?line: top, ?column: top, ?variables: Array[Symbol]) -> MethodType
+
+    # Parse a type and return it
+    #
+    # When `pos` keyword is specified, skips the first `pos` characters from the input.
+    # If no token is left in the input, it returns `nil`.
+    #
+    # ```ruby
+    # RBS::Parser.parse_type("String", range: 0...)             # => `String`
+    # RBS::Parser.parse_type("String Integer", pos: 7...)       # => `Integer`
+    # RBS::Parser.parse_type("String Integer", pos: 14...)      # => nil
+    # ```
+    #
+    # `line` and `column` is deprecated and are ignored.
+    #
+    def self.parse_type: (Buffer | String, range: Range[Integer?], ?variables: Array[Symbol]) -> Types::t?
+                       | (Buffer | String, ?line: top, ?column: top, ?variables: Array[Symbol]) -> Types::t
+
+    # Parse whole RBS file and return an array of declarations
+    #
+    # `line` and `column` is deprecated and are ignored.
+    #
+    def self.parse_signature: (Buffer | String) -> Array[AST::Declarations::t]
+                            | (Buffer | String, ?line: top, ?column: top) -> Array[AST::Declarations::t]
 
     KEYWORDS: Hash[String, bot]
 
@@ -12,14 +45,11 @@ module RBS
 
     def self.buffer: (String | Buffer source) -> Buffer
 
-    %a{no-defn}
-    def self._parse_type: (Buffer, Integer line, Integer column, Array[Symbol] variables) -> Types::t
+    def self._parse_type: (Buffer, Integer start_pos, Integer end_pos, Array[Symbol] variables, boolish eof) -> Types::t?
 
-    %a{no-defn}
-    def self._parse_method_type: (Buffer, Integer line, Integer column, Array[Symbol] variables) -> MethodType
+    def self._parse_method_type: (Buffer, Integer start_pos, Integer end_pos, Array[Symbol] variables, boolish eof) -> MethodType?
 
-    %a{no-defn}
-    def self._parse_signature: (Buffer, Integer line, Integer column) -> Array[AST::Declarations::t]
+    def self._parse_signature: (Buffer, Integer end_pos) -> Array[AST::Declarations::t]
 
     class LocatedValue
     end

data/stdlib/ipaddr/0/ipaddr.rbs

@@ -406,3 +406,18 @@ IPAddr::IN6FORMAT: String
 # 128 bit mask for IPv6
 #
 IPAddr::IN6MASK: Integer
+
+# <!-- rdoc-file=lib/ipaddr.rb -->
+# Regexp *internally* used for parsing IPv4 address.
+#
+IPAddr::RE_IPV4ADDRLIKE: Regexp
+
+# <!-- rdoc-file=lib/ipaddr.rb -->
+# Regexp *internally* used for parsing IPv6 address.
+#
+IPAddr::RE_IPV6ADDRLIKE_COMPRESSED: Regexp
+
+# <!-- rdoc-file=lib/ipaddr.rb -->
+# Regexp *internally* used for parsing IPv6 address.
+#
+IPAddr::RE_IPV6ADDRLIKE_FULL: Regexp

data/stdlib/socket/0/addrinfo.rbs

@@ -57,7 +57,8 @@ class Addrinfo
   #     #=> [#<Addrinfo: 203.178.141.194:80 TCP (www.kame.net)>,
   #     #    #<Addrinfo: [2001:200:dff:fff1:216:3eff:feb1:44d7]:80 TCP (www.kame.net)>]
   #
-  def self.getaddrinfo: (String nodename, ?String | Integer service, ?Symbol? family, ?Symbol | Integer protocol) -> Array[Addrinfo]
+  def self.getaddrinfo: (String nodename, ?String | Integer | nil service, ?Symbol? family, ?Symbol | Integer protocol) -> Array[Addrinfo]
+                      | (String? nodename, ?String | Integer service, ?Symbol? family, ?Symbol | Integer protocol) -> Array[Addrinfo]
 
   # <!--
   #   rdoc-file=ext/socket/raddrinfo.c