rbs 1.7.0.beta.1 → 1.7.0.beta.5

data/lib/rbs/prototype/helpers.rb

@@ -0,0 +1,113 @@
+module RBS
+  module Prototype
+    module Helpers
+      private
+
+      def block_from_body(node)
+        _, args_node, body_node = node.children
+
+        _pre_num, _pre_init, _opt, _first_post, _post_num, _post_init, _rest, _kw, _kwrest, block = args_from_node(args_node)
+
+        method_block = nil
+
+        if block
+          method_block = Types::Block.new(
+            # HACK: The `block` is :& on `def m(...)` syntax.
+            #       In this case the block looks optional in most cases, so it marks optional.
+            #       In other cases, we can't determine which is required or optional, so it marks required.
+            required: block != :&,
+            type: Types::Function.empty(untyped)
+          )
+        end
+
+        if body_node
+          if (yields = any_node?(body_node) {|n| n.type == :YIELD })
+            method_block = Types::Block.new(
+              required: true,
+              type: Types::Function.empty(untyped)
+            )
+
+            yields.each do |yield_node|
+              array_content = yield_node.children[0]&.children&.compact || []
+
+              positionals, keywords = if keyword_hash?(array_content.last)
+                                        [array_content.take(array_content.size - 1), array_content.last]
+                                      else
+                                        [array_content, nil]
+                                      end
+
+              if (diff = positionals.size - method_block.type.required_positionals.size) > 0
+                diff.times do
+                  method_block.type.required_positionals << Types::Function::Param.new(
+                    type: untyped,
+                    name: nil
+                  )
+                end
+              end
+
+              if keywords
+                keywords.children[0].children.each_slice(2) do |key_node, value_node|
+                  if key_node
+                    key = key_node.children[0]
+                    method_block.type.required_keywords[key] ||=
+                      Types::Function::Param.new(
+                        type: untyped,
+                        name: nil
+                      )
+                  end
+                end
+              end
+            end
+          end
+        end
+
+        method_block
+      end
+
+      def each_child(node, &block)
+        each_node node.children, &block
+      end
+
+      def each_node(nodes)
+        nodes.each do |child|
+          if child.is_a?(RubyVM::AbstractSyntaxTree::Node)
+            yield child
+          end
+        end
+      end
+
+
+      def any_node?(node, nodes: [], &block)
+        if yield(node)
+          nodes << node
+        end
+
+        each_child node do |child|
+          any_node? child, nodes: nodes, &block
+        end
+
+        nodes.empty? ? nil : nodes
+      end
+
+      def keyword_hash?(node)
+        if node
+          if node.type == :HASH
+            node.children[0].children.compact.each_slice(2).all? {|key, _|
+              key.type == :LIT && key.children[0].is_a?(Symbol)
+            }
+          end
+        end
+      end
+
+      # NOTE: args_node may be a nil by a bug
+      #       https://bugs.ruby-lang.org/issues/17495
+      def args_from_node(args_node)
+        args_node&.children || [0, nil, nil, nil, 0, nil, nil, nil, nil, nil]
+      end
+
+      def untyped
+        @untyped ||= Types::Bases::Any.new(location: nil)
+      end
+    end
+  end
+end

data/lib/rbs/prototype/rb.rb

@@ -1,6 +1,8 @@
 module RBS
   module Prototype
     class RB
+      include Helpers
+
       Context = Struct.new(:module_function, :singleton, :namespace, keyword_init: true) do
         def self.initial(namespace: Namespace.root)
           self.new(module_function: false, singleton: false, namespace: namespace)
@@ -372,18 +374,6 @@ module RBS
         end
       end
 
-      def each_node(nodes)
-        nodes.each do |child|
-          if child.is_a?(RubyVM::AbstractSyntaxTree::Node)
-            yield child
-          end
-        end
-      end
-
-      def each_child(node, &block)
-        each_node node.children, &block
-      end
-
       def function_type_from_body(node, def_name)
         table_node, args_node, *_ = node.children
 
@@ -568,95 +558,6 @@ module RBS
         end
       end
 
-      def block_from_body(node)
-        _, args_node, body_node = node.children
-
-        _pre_num, _pre_init, _opt, _first_post, _post_num, _post_init, _rest, _kw, _kwrest, block = args_from_node(args_node)
-
-        method_block = nil
-
-        if block
-          method_block = Types::Block.new(
-            # HACK: The `block` is :& on `def m(...)` syntax.
-            #       In this case the block looks optional in most cases, so it marks optional.
-            #       In other cases, we can't determine which is required or optional, so it marks required.
-            required: block != :&,
-            type: Types::Function.empty(untyped)
-          )
-        end
-
-        if body_node
-          if (yields = any_node?(body_node) {|n| n.type == :YIELD })
-            method_block = Types::Block.new(
-              required: true,
-              type: Types::Function.empty(untyped)
-            )
-
-            yields.each do |yield_node|
-              array_content = yield_node.children[0]&.children&.compact || []
-
-              positionals, keywords = if keyword_hash?(array_content.last)
-                                        [array_content.take(array_content.size - 1), array_content.last]
-                                      else
-                                        [array_content, nil]
-                                      end
-
-              if (diff = positionals.size - method_block.type.required_positionals.size) > 0
-                diff.times do
-                  method_block.type.required_positionals << Types::Function::Param.new(
-                    type: untyped,
-                    name: nil
-                  )
-                end
-              end
-
-              if keywords
-                keywords.children[0].children.each_slice(2) do |key_node, value_node|
-                  if key_node
-                    key = key_node.children[0]
-                    method_block.type.required_keywords[key] ||=
-                      Types::Function::Param.new(
-                        type: untyped,
-                        name: nil
-                      )
-                  end
-                end
-              end
-            end
-          end
-        end
-
-        method_block
-      end
-
-      # NOTE: args_node may be a nil by a bug
-      #       https://bugs.ruby-lang.org/issues/17495
-      def args_from_node(args_node)
-        args_node&.children || [0, nil, nil, nil, 0, nil, nil, nil, nil, nil]
-      end
-
-      def keyword_hash?(node)
-        if node
-          if node.type == :HASH
-            node.children[0].children.compact.each_slice(2).all? {|key, _|
-              key.type == :LIT && key.children[0].is_a?(Symbol)
-            }
-          end
-        end
-      end
-
-      def any_node?(node, nodes: [], &block)
-        if yield(node)
-          nodes << node
-        end
-
-        each_child node do |child|
-          any_node? child, nodes: nodes, &block
-        end
-
-        nodes.empty? ? nil : nodes
-      end
-
       def node_type(node, default: Types::Bases::Any.new(location: nil))
         case node.type
         when :LIT
@@ -689,10 +590,6 @@ module RBS
         end
       end
 
-      def untyped
-        @untyped ||= Types::Bases::Any.new(location: nil)
-      end
-
       def private
         @private ||= AST::Members::Private.new(location: nil)
       end

data/lib/rbs/prototype/runtime.rb

@@ -1,6 +1,8 @@
 module RBS
   module Prototype
     class Runtime
+      include Helpers
+
       attr_reader :patterns
       attr_reader :env
       attr_reader :merge
@@ -138,6 +140,8 @@ module RBS
           end
         end
 
+        block ||= block_from_ast_of(method)
+
         return_type = if method.name == :initialize
                         Types::Bases::Void.new(location: nil)
                       else
@@ -522,6 +526,18 @@ module RBS
           []
         end
       end
+
+      def block_from_ast_of(method)
+        return nil if RUBY_VERSION < '3.1'
+
+        begin
+          ast = RubyVM::AbstractSyntaxTree.of(method)
+        rescue ArgumentError
+          return # When the method is defined in eval
+        end
+
+        block_from_body(ast) if ast&.type == :SCOPE
+      end
     end
   end
 end

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.1"
+  VERSION = "1.7.0.beta.5"
 end

data/lib/rbs.rb

@@ -32,6 +32,7 @@ require "rbs/constant"
 require "rbs/constant_table"
 require "rbs/ast/comment"
 require "rbs/writer"
+require "rbs/prototype/helpers"
 require "rbs/prototype/rbi"
 require "rbs/prototype/rb"
 require "rbs/prototype/runtime"
@@ -46,7 +47,7 @@ require "rbs/locator"
 require "rbs/type_alias_dependency"
 require "rbs/collection"
 
-require "rbs/extension"
+require "rbs_extension"
 require "rbs/parser_aux"
 require "rbs/location_aux"
 
@@ -68,5 +69,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

data/rbs.gemspec

@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
   spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features|bin)/}) }
   end
-  spec.extensions = %w{ext/rbs/extension/extconf.rb}
+  spec.extensions = %w{ext/rbs_extension/extconf.rb}
 
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }

data/sig/errors.rbs

@@ -24,6 +24,16 @@ module RBS
     attr_reader token_type: String
 
     def initialize: (Location[untyped, untyped], String error_message, String token_type) -> void
+
+    def error_value: () -> String
+
+    def token_str: () -> String
+  end
+
+  class Parser
+    SemanticsError: singleton(ParsingError)
+    SyntaxError: singleton(ParsingError)
+    LexerError: singleton(ParsingError)
   end
 
   # Error class for errors raised during loading environments.

data/sig/location.rbs

@@ -20,6 +20,9 @@ module RBS
 
     def initialize: (Buffer, Integer start_pos, Integer end_pos) -> void
 
+    def self.new: (Buffer, Integer start_pos, Integer end_pos) -> instance
+                | (buffer: Buffer, start_pos: Integer, end_pos: Integer) -> instance
+
     def inspect: () -> String
 
     # Returns the name of the buffer.
@@ -92,5 +95,7 @@ module RBS
     def _add_optional_no_child: (OptionalChildKeys name) -> void
     def _optional_keys: () -> Array[Symbol]
     def _required_keys: () -> Array[Symbol]
+
+    WithChildren: singleton(Location)
   end
 end

data/sig/parser.rbs

@@ -6,6 +6,8 @@ module RBS
 
     def self.parse_signature: (Buffer | String, ?line: Integer, ?column: Integer) -> Array[AST::Declarations::t]
 
+    KEYWORDS: Hash[String, bot]
+
     private
 
     def self.buffer: (String | Buffer source) -> Buffer
@@ -18,5 +20,8 @@ module RBS
 
     %a{no-defn}
     def self._parse_signature: (Buffer, Integer line, Integer column) -> Array[AST::Declarations::t]
+
+    class LocatedValue
+    end
   end
 end

data/sig/rbs.rbs

@@ -8,6 +8,10 @@ module RBS
   def self.logger_output: () -> IO
 
   def self.logger_output=: (IO) -> IO
+
+  def self.print_warning: () { () -> String } -> void
+
+  self.@warnings: Set[String]
 end
 
 module Ruby

data/stdlib/io-console/0/io-console.rbs

@@ -0,0 +1,137 @@
+class IO
+  class ConsoleMode
+    def echo=: (bool) -> bool
+    def raw: (?min: int, ?time: int, ?intr: bool) -> self
+    def raw!: (?min: int, ?time: int, ?intr: bool) -> self
+  end
+
+  # Returns an File instance opened console.
+  #
+  # If `sym` is given, it will be sent to the opened console with `args` and the
+  # result will be returned instead of the console IO itself.
+  def self.console: () -> File?
+                  | (:close) -> nil
+                  | (Symbol sym, *untyped args) -> untyped
+
+  # returns console window size
+  #
+  # You must require 'io/console/size' to use this method.
+  def self.console_size: () -> [Integer, Integer]
+
+  # fallback to console window size
+  #
+  # You must require 'io/console/size' to use this method.
+  def self.default_console_size: -> [Integer, Integer]
+
+  def beep: () -> self
+
+  def check_winsize_changed: () { () -> void } -> self
+  def clear_screen: () -> self
+
+  # Returns a data represents the current console mode.
+  def console_mode: () -> IO::ConsoleMode
+
+  # Sets the console mode to `mode`.
+  def console_mode=: (IO::ConsoleMode mode) -> IO::ConsoleMode
+
+  # Yields `self` within cooked mode.
+  #
+  #     STDIN.cooked(&:gets)
+  #
+  # will read and return a line with echo back and line editing.
+  def cooked: [T] () { (self) -> T } -> T
+
+  # Enables cooked mode.
+  #
+  # If the terminal mode needs to be back, use io.cooked { ... }.
+  def cooked!: () -> self
+
+  def cursor: () -> [Integer, Integer]
+  def cursor=: ([Integer, Integer]) -> [Integer, Integer]
+
+  def cursor_down: (int) -> self
+  def cursor_left: (int) -> self
+  def cursor_right: (int) -> self
+  def cursor_up: (int) -> self
+
+  # Enables/disables echo back. On some platforms, all combinations of this flags
+  # and raw/cooked mode may not be valid.
+  def echo=: (bool flag) -> bool
+
+  # Returns `true` if echo back is enabled.
+  def echo?: () -> bool
+
+  def erase_line: (0 | 1 | 2 | nil) -> self
+  def erase_screen: (0 | 1 | 2 | 3 | nil) -> self
+
+  # Reads and returns a character in raw mode.
+  #
+  # See IO#raw for details on the parameters.
+  def getch: (?min: int, ?time: int, ?intr: bool) -> String
+
+  # Reads and returns a line without echo back.
+  # Prints +prompt+ unless it is +nil+.
+  #
+  # The newline character that terminates the
+  # read line is removed from the returned string,
+  # see String#chomp!.
+  def getpass: (?String) -> String
+
+  def goto: (int, int) -> self
+
+  def goto_column: (int) -> self
+
+  # Flushes input buffer in kernel.
+  def iflush: () -> self
+
+  # Flushes input and output buffers in kernel.
+  def ioflush: () -> self
+
+  # Yields `self` with disabling echo back.
+  #
+  #     STDIN.noecho(&:gets)
+  #
+  # will read and return a line without echo back.
+  def noecho: [T] () { (self) -> T } -> T
+
+  # Flushes output buffer in kernel.
+  def oflush: () -> self
+
+  def pressed?: (Integer | Symbol | String) -> bool
+
+  # Yields `self` within raw mode, and returns the result of the block.
+  #
+  #     STDIN.raw(&:gets)
+  #
+  # will read and return a line without echo back and line editing.
+  #
+  # The parameter `min` specifies the minimum number of bytes that should be
+  # received when a read operation is performed. (default: 1)
+  #
+  # The parameter `time` specifies the timeout in *seconds* with a precision of
+  # 1/10 of a second. (default: 0)
+  #
+  # If the parameter `intr` is `true`, enables break, interrupt, quit, and suspend
+  # special characters.
+  #
+  # Refer to the manual page of termios for further details.
+  def raw: [T] (?min: int, ?time: int, ?intr: bool) { (self) -> T } -> T
+
+  # Enables raw mode, and returns `io`.
+  #
+  # If the terminal mode needs to be back, use `io.raw { ... }`.
+  #
+  # See IO#raw for details on the parameters.
+  def raw!: (?min: int, ?time: int, ?intr: bool) -> self
+
+  def scroll_backward: (int) -> self
+  def scroll_forward: (int) -> self
+
+  # Returns console size.
+  def winsize: () -> [Integer, Integer]
+
+  # Tries to set console size.  The effect depends on the platform and the running
+  # environment.
+  def winsize=: ([Integer, Integer]) -> [Integer, Integer]
+              | ([Integer, Integer, Integer, Integer]) -> [Integer, Integer, Integer, Integer]
+end

data/stdlib/net-http/0/net-http.rbs

@@ -1204,6 +1204,7 @@ module Net
 
   class HTTPRequest < HTTPGenericRequest
     def initialize: (String path, ?Hash[String, untyped] initheader) -> void
+                  | (URI::Generic uri, ?Hash[String, untyped] initheader) -> void
   end
 
   class HTTP::Get < HTTPRequest
@@ -1843,4 +1844,4 @@ module Net
   class HTTPFatalError < ProtoFatalError
     include Net::HTTPExceptions
   end
-end
+end

data/stdlib/tempfile/0/tempfile.rbs

@@ -95,8 +95,8 @@ class Tempfile < File
   #        # ... do something with f ...
   #     end
   #
-  def self.create: (?String basename, ?String? tmpdir, ?mode: Integer, **untyped) -> File
-                 | [A] (?String basename, ?String? tmpdir, ?mode: Integer, **untyped) { (File) -> A } -> A
+  def self.create: (?(String | [String, String]) basename, ?String? tmpdir, ?mode: Integer, **untyped) -> File
+                 | [A] (?(String | [String, String]) basename, ?String? tmpdir, ?mode: Integer, **untyped) { (File) -> A } -> A
 
   # Creates a new Tempfile.
   #
@@ -220,8 +220,6 @@ class Tempfile < File
     def initialize: (::Tempfile tmpfile) -> void
   end
 
-  private
-
   # Creates a temporary file with permissions 0600 (= only readable and writable
   # by the owner) and opens it with mode "w+".
   #
@@ -265,6 +263,6 @@ class Tempfile < File
   # If Tempfile.new cannot find a unique filename within a limited number of
   # tries, then it will raise an exception.
   #
-  def self.new: (?String basename, ?String? tmpdir, ?mode: Integer, **untyped) -> instance
-              | [A] (?String basename, ?String? tmpdir, ?mode: Integer, **untyped) { (instance) -> A } -> A
+  def self.new: (?(String | [String, String]) basename, ?String? tmpdir, ?mode: Integer, **untyped) -> instance
+              | [A] (?(String | [String, String]) basename, ?String? tmpdir, ?mode: Integer, **untyped) { (instance) -> A } -> A
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbs
 version: !ruby/object:Gem::Version
-  version: 1.7.0.beta.1
+  version: 1.7.0.beta.5
 platform: ruby
 authors:
 - Soutaro Matsumoto
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-09-13 00:00:00.000000000 Z
+date: 2021-11-07 00:00:00.000000000 Z
 dependencies: []
 description: RBS is the language for type signatures for Ruby and standard library
   definitions.
@@ -17,7 +17,7 @@ email:
 executables:
 - rbs
 extensions:
-- ext/rbs/extension/extconf.rb
+- ext/rbs_extension/extconf.rb
 extra_rdoc_files: []
 files:
 - ".github/dependabot.yml"
@@ -98,22 +98,24 @@ files:
 - docs/stdlib.md
 - docs/syntax.md
 - exe/rbs
-- ext/rbs/extension/constants.c
-- ext/rbs/extension/constants.h
-- ext/rbs/extension/extconf.rb
-- ext/rbs/extension/lexer.c
-- ext/rbs/extension/lexer.h
-- ext/rbs/extension/location.c
-- ext/rbs/extension/location.h
-- ext/rbs/extension/main.c
-- ext/rbs/extension/parser.c
-- ext/rbs/extension/parser.h
-- ext/rbs/extension/parserstate.c
-- ext/rbs/extension/parserstate.h
-- ext/rbs/extension/rbs_extension.h
-- ext/rbs/extension/ruby_objs.c
-- ext/rbs/extension/ruby_objs.h
-- ext/rbs/extension/unescape.c
+- ext/rbs_extension/constants.c
+- ext/rbs_extension/constants.h
+- ext/rbs_extension/extconf.rb
+- ext/rbs_extension/lexer.c
+- ext/rbs_extension/lexer.h
+- ext/rbs_extension/lexer.re
+- ext/rbs_extension/lexstate.c
+- ext/rbs_extension/location.c
+- ext/rbs_extension/location.h
+- ext/rbs_extension/main.c
+- ext/rbs_extension/parser.c
+- ext/rbs_extension/parser.h
+- ext/rbs_extension/parserstate.c
+- ext/rbs_extension/parserstate.h
+- ext/rbs_extension/rbs_extension.h
+- ext/rbs_extension/ruby_objs.c
+- ext/rbs_extension/ruby_objs.h
+- ext/rbs_extension/unescape.c
 - goodcheck.yml
 - lib/rbs.rb
 - lib/rbs/ancestor_graph.rb
@@ -152,6 +154,11 @@ files:
 - lib/rbs/namespace.rb
 - lib/rbs/parser.y
 - lib/rbs/parser_aux.rb
+- lib/rbs/parser_compat/lexer_error.rb
+- lib/rbs/parser_compat/located_value.rb
+- lib/rbs/parser_compat/semantics_error.rb
+- lib/rbs/parser_compat/syntax_error.rb
+- lib/rbs/prototype/helpers.rb
 - lib/rbs/prototype/rb.rb
 - lib/rbs/prototype/rbi.rb
 - lib/rbs/prototype/runtime.rb
@@ -245,6 +252,7 @@ files:
 - stdlib/fileutils/0/fileutils.rbs
 - stdlib/find/0/find.rbs
 - stdlib/forwardable/0/forwardable.rbs
+- stdlib/io-console/0/io-console.rbs
 - stdlib/ipaddr/0/ipaddr.rbs
 - stdlib/json/0/json.rbs
 - stdlib/logger/0/formatter.rbs