rbs 3.8.0.pre.1 → 3.8.0

data/core/trace_point.rbs

@@ -1,123 +1,121 @@
 # <!-- rdoc-file=trace_point.rb -->
-# A class that provides the functionality of Kernel#set_trace_func in a nice
-# Object-Oriented API.
+# A class that provides the functionality of Kernel#set_trace_func in a
+# well-structured Object-Oriented API.
 #
 # ## Example
 #
-# We can use TracePoint to gather information specifically for exceptions:
+# Use TracePoint to gather information specifically for exceptions:
 #
 #     trace = TracePoint.new(:raise) do |tp|
-#         p [tp.lineno, tp.event, tp.raised_exception]
+#       p [tp.lineno, tp.event, tp.raised_exception]
 #     end
 #     #=> #<TracePoint:disabled>
 #
-#     trace.enable
-#     #=> false
+#     trace.enable  #=> false
 #
 #     0 / 0
 #     #=> [5, :raise, #<ZeroDivisionError: divided by 0>]
 #
 # ## Events
 #
-# If you don't specify the type of events you want to listen for, TracePoint
+# If you don't specify the types of events you want to listen for, TracePoint
 # will include all available events.
 #
-# **Note** do not depend on current event set, as this list is subject to
-# change. Instead, it is recommended you specify the type of events you want to
+# **Note:** Do not depend on the current event set, as this list is subject to
+# change. Instead, it is recommended to specify the types of events you want to
 # use.
 #
 # To filter what is traced, you can pass any of the following as `events`:
 #
 # `:line`
-# :   execute an expression or statement on a new line
+# :   Execute an expression or statement on a new line.
 #
 # `:class`
-# :   start a class or module definition
+# :   Start a class or module definition.
 #
 # `:end`
-# :   finish a class or module definition
+# :   Finish a class or module definition.
 #
 # `:call`
-# :   call a Ruby method
+# :   Call a Ruby method.
 #
 # `:return`
-# :   return from a Ruby method
+# :   Return from a Ruby method.
 #
 # `:c_call`
-# :   call a C-language routine
+# :   Call a C-language routine.
 #
 # `:c_return`
-# :   return from a C-language routine
+# :   Return from a C-language routine.
 #
 # `:raise`
-# :   raise an exception
+# :   Raise an exception.
 #
 # `:rescue`
-# :   rescue an exception
+# :   Rescue an exception.
 #
 # `:b_call`
-# :   event hook at block entry
+# :   Event hook at block entry.
 #
 # `:b_return`
-# :   event hook at block ending
+# :   Event hook at block ending.
 #
 # `:a_call`
-# :   event hook at all calls (`call`, `b_call`, and `c_call`)
+# :   Event hook at all calls (`call`, `b_call`, and `c_call`).
 #
 # `:a_return`
-# :   event hook at all returns (`return`, `b_return`, and `c_return`)
+# :   Event hook at all returns (`return`, `b_return`, and `c_return`).
 #
 # `:thread_begin`
-# :   event hook at thread beginning
+# :   Event hook at thread beginning.
 #
 # `:thread_end`
-# :   event hook at thread ending
+# :   Event hook at thread ending.
 #
 # `:fiber_switch`
-# :   event hook at fiber switch
+# :   Event hook at fiber switch.
 #
 # `:script_compiled`
-# :   new Ruby code compiled (with `eval`, `load` or `require`)
+# :   New Ruby code compiled (with `eval`, `load`, or `require`).
 #
 class TracePoint
   # <!--
   #   rdoc-file=trace_point.rb
-  #   - TracePoint.new(*events) { |obj| block }         -> obj
+  #   - TracePoint.new(*events) { |tp| block } -> tp
   # -->
   # Returns a new TracePoint object, not enabled by default.
   #
-  # Next, in order to activate the trace, you must use TracePoint#enable
+  # To activate the TracePoint object, use TracePoint#enable:
   #
   #     trace = TracePoint.new(:call) do |tp|
-  #         p [tp.lineno, tp.defined_class, tp.method_id, tp.event]
+  #       p [tp.lineno, tp.defined_class, tp.method_id, tp.event]
   #     end
   #     #=> #<TracePoint:disabled>
   #
-  #     trace.enable
-  #     #=> false
+  #     trace.enable  #=> false
   #
   #     puts "Hello, TracePoint!"
   #     # ...
   #     # [48, IRB::Notifier::AbstractNotifier, :printf, :call]
   #     # ...
   #
-  # When you want to deactivate the trace, you must use TracePoint#disable
+  # To deactivate the trace, use TracePoint#disable.
   #
   #     trace.disable
   #
   # See TracePoint@Events for possible events and more information.
   #
-  # A block must be given, otherwise an ArgumentError is raised.
+  # A block must be given; otherwise, an ArgumentError is raised.
   #
   # If the trace method isn't included in the given events filter, a RuntimeError
   # is raised.
   #
   #     TracePoint.trace(:line) do |tp|
-  #         p tp.raised_exception
+  #       p tp.raised_exception
   #     end
   #     #=> RuntimeError: 'raised_exception' not supported by this event
   #
-  # If the trace method is called outside block, a RuntimeError is raised.
+  # If the trace method is called outside a block, a RuntimeError is raised.
   #
   #     TracePoint.trace(:line) do |tp|
   #       $tp = tp
@@ -132,13 +130,12 @@ class TracePoint
   #   rdoc-file=trace_point.rb
   #   - TracePoint.allow_reentry { block }
   # -->
-  # In general, while a TracePoint callback is running, other registered callbacks
-  # are not called to avoid confusion by reentrance. This method allows the
-  # reentrance in a given block. This method should be used carefully, otherwise
-  # the callback can be easily called infinitely.
+  # Generally, while a TracePoint callback is running, other registered callbacks
+  # are not called to avoid confusion from reentrance. This method allows
+  # reentrance within a given block. Use this method carefully to avoid infinite
+  # callback invocation.
   #
-  # If this method is called when the reentrance is already allowed, it raises a
-  # RuntimeError.
+  # If called when reentrance is already allowed, it raises a RuntimeError.
   #
   # **Example:**
   #
@@ -146,7 +143,7 @@ class TracePoint
   #     # ---------------
   #
   #     line_handler = TracePoint.new(:line) do |tp|
-  #       next if tp.path != __FILE__ # only work in this file
+  #       next if tp.path != __FILE__ # Only works in this file
   #       puts "Line handler"
   #       binding.eval("class C; end")
   #     end.enable
@@ -158,15 +155,15 @@ class TracePoint
   #     class B
   #     end
   #
-  #     # This script will print "Class handler" only once: when inside :line
-  #     # handler, all other handlers are ignored
+  #     # This script will print "Class handler" only once: when inside the :line
+  #     # handler, all other handlers are ignored.
   #
   #     # With reentry
   #     # ------------
   #
   #     line_handler = TracePoint.new(:line) do |tp|
-  #       next if tp.path != __FILE__ # only work in this file
-  #       next if (__LINE__..__LINE__+3).cover?(tp.lineno) # don't be invoked from itself
+  #       next if tp.path != __FILE__ # Only works in this file
+  #       next if (__LINE__..__LINE__+3).cover?(tp.lineno) # Prevent infinite calls
   #       puts "Line handler"
   #       TracePoint.allow_reentry { binding.eval("class C; end") }
   #     end.enable
@@ -178,15 +175,15 @@ class TracePoint
   #     class B
   #     end
   #
-  #     # This wil print "Class handler" twice: inside allow_reentry block in :line
+  #     # This will print "Class handler" twice: inside the allow_reentry block in the :line
   #     # handler, other handlers are enabled.
   #
   # Note that the example shows the principal effect of the method, but its
   # practical usage is for debugging libraries that sometimes require other
-  # libraries hooks to not be affected by debugger being inside trace point
+  # libraries' hooks to not be affected by the debugger being inside trace point
   # handling. Precautions should be taken against infinite recursion in this case
-  # (note that we needed to filter out calls by itself from :line handler,
-  # otherwise it will call itself infinitely).
+  # (note that we needed to filter out calls by itself from the :line handler,
+  # otherwise it would call itself infinitely).
   #
   def self.allow_reentry: [T] () { (nil) -> T } -> T
 
@@ -196,8 +193,8 @@ class TracePoint
   # -->
   # Returns internal information of TracePoint.
   #
-  # The contents of the returned value are implementation specific. It may be
-  # changed in future.
+  # The contents of the returned value are implementation-specific and may change
+  # in the future.
   #
   # This method is only for debugging TracePoint itself.
   #
@@ -205,15 +202,15 @@ class TracePoint
 
   # <!--
   #   rdoc-file=trace_point.rb
-  #   - TracePoint.trace(*events) { |obj| block }        -> obj
+  #   - TracePoint.trace(*events) { |tp| block } -> obj
   # -->
-  # A convenience method for TracePoint.new, that activates the trace
+  # A convenience method for TracePoint.new that activates the trace
   # automatically.
   #
   #     trace = TracePoint.trace(:call) { |tp| [tp.lineno, tp.event] }
   #     #=> #<TracePoint:enabled>
   #
-  #     trace.enabled? #=> true
+  #     trace.enabled?  #=> true
   #
   def self.trace: (*_ToSym events) { (instance tp) -> void } -> instance
 
@@ -221,9 +218,9 @@ class TracePoint
   #   rdoc-file=trace_point.rb
   #   - binding()
   # -->
-  # Return the generated binding object from event.
+  # Returns the generated binding object from the event.
   #
-  # Note that for `:c_call` and `:c_return` events, the method will return `nil`,
+  # Note that for `:c_call` and `:c_return` events, the method returns `nil`,
   # since C methods themselves do not have bindings.
   #
   def binding: () -> Binding?
@@ -232,7 +229,7 @@ class TracePoint
   #   rdoc-file=trace_point.rb
   #   - callee_id()
   # -->
-  # Return the called name of the method being called
+  # Returns the called name of the method being called.
   #
   def callee_id: () -> Symbol?
 
@@ -240,7 +237,7 @@ class TracePoint
   #   rdoc-file=trace_point.rb
   #   - defined_class()
   # -->
-  # Return class or module of the method being called.
+  # Returns the class or module of the method being called.
   #
   #     class C; def foo; end; end
   #     trace = TracePoint.new(:call) do |tp|
@@ -249,20 +246,20 @@ class TracePoint
   #       C.new.foo
   #     end
   #
-  # If method is defined by a module, then that module is returned.
+  # If the method is defined by a module, then that module is returned.
   #
   #     module M; def foo; end; end
-  #     class C; include M; end;
+  #     class C; include M; end
   #     trace = TracePoint.new(:call) do |tp|
   #       p tp.defined_class #=> M
   #     end.enable do
   #       C.new.foo
   #     end
   #
-  # **Note:** #defined_class returns singleton class.
+  # **Note:** #defined_class returns the singleton class.
   #
-  # 6th block parameter of Kernel#set_trace_func passes original class of attached
-  # by singleton class.
+  # The 6th block parameter of Kernel#set_trace_func passes the original class
+  # attached by the singleton class.
   #
   # **This is a difference between Kernel#set_trace_func and TracePoint.**
   #
@@ -277,31 +274,30 @@ class TracePoint
 
   # <!--
   #   rdoc-file=trace_point.rb
-  #   - trace.disable               -> true or false
+  #   - trace.disable -> true or false
   #   - trace.disable { block } -> obj
   # -->
-  # Deactivates the trace
+  # Deactivates the trace.
   #
-  # Return true if trace was enabled. Return false if trace was disabled.
+  # Returns `true` if the trace was enabled. Returns `false` if the trace was
+  # disabled.
   #
-  #     trace.enabled?      #=> true
-  #     trace.disable       #=> true (previous status)
-  #     trace.enabled?      #=> false
-  #     trace.disable       #=> false
+  #     trace.enabled?  #=> true
+  #     trace.disable   #=> true (previous status)
+  #     trace.enabled?  #=> false
+  #     trace.disable   #=> false
   #
-  # If a block is given, the trace will only be disable within the scope of the
+  # If a block is given, the trace will only be disabled within the scope of the
   # block.
   #
-  #     trace.enabled?
-  #     #=> true
+  #     trace.enabled?  #=> true
   #
   #     trace.disable do
-  #         trace.enabled?
-  #         # only disabled for this block
+  #       trace.enabled?
+  #       # Only disabled for this block
   #     end
   #
-  #     trace.enabled?
-  #     #=> true
+  #     trace.enabled?  #=> true
   #
   # Note: You cannot access event hooks within the block.
   #
@@ -313,12 +309,13 @@ class TracePoint
 
   # <!--
   #   rdoc-file=trace_point.rb
-  #   - trace.enable(target: nil, target_line: nil, target_thread: nil)    -> true or false
-  #   - trace.enable(target: nil, target_line: nil, target_thread: :default) { block }  -> obj
+  #   - trace.enable(target: nil, target_line: nil, target_thread: nil) -> true or false
+  #   - trace.enable(target: nil, target_line: nil, target_thread: :default) { block } -> obj
   # -->
   # Activates the trace.
   #
-  # Returns `true` if trace was enabled. Returns `false` if trace was disabled.
+  # Returns `true` if the trace was enabled. Returns `false` if the trace was
+  # disabled.
   #
   #     trace.enabled?  #=> false
   #     trace.enable    #=> false (previous state)
@@ -327,24 +324,22 @@ class TracePoint
   #     trace.enable    #=> true (previous state)
   #                     #   trace is still enabled
   #
-  # If a block is given, the trace will only be enabled during the block call. If
-  # target and target_line are both nil, then target_thread will default to the
-  # current thread if a block is given.
+  # If a block is given, the trace will only be enabled during the block
+  # execution. If target and target_line are both nil, then target_thread will
+  # default to the current thread if a block is given.
   #
-  #     trace.enabled?
-  #     #=> false
+  #     trace.enabled?  #=> false
   #
   #     trace.enable do
   #       trace.enabled?
-  #       # only enabled for this block and thread
+  #       # Only enabled for this block and thread
   #     end
   #
-  #     trace.enabled?
-  #     #=> false
+  #     trace.enabled?  #=> false
   #
-  # `target`, `target_line` and `target_thread` parameters are used to limit
-  # tracing only to specified code objects. `target` should be a code object for
-  # which RubyVM::InstructionSequence.of will return an instruction sequence.
+  # The `target`, `target_line`, and `target_thread` parameters are used to limit
+  # tracing to specified code objects. `target` should be a code object for which
+  # RubyVM::InstructionSequence.of will return an instruction sequence.
   #
   #     t = TracePoint.new(:line) { |tp| p tp }
   #
@@ -359,9 +354,9 @@ class TracePoint
   #     t.enable(target: method(:m1))
   #
   #     m1
-  #     # prints #<TracePoint:line test.rb:4 in `m1'>
+  #     # Prints #<TracePoint:line test.rb:4 in `m1'>
   #     m2
-  #     # prints nothing
+  #     # Prints nothing
   #
   # Note: You cannot access event hooks within the `enable` block.
   #
@@ -373,9 +368,9 @@ class TracePoint
 
   # <!--
   #   rdoc-file=trace_point.rb
-  #   - trace.enabled?          -> true or false
+  #   - trace.enabled? -> true or false
   # -->
-  # The current status of the trace
+  # Returns the current status of the trace.
   #
   def enabled?: () -> bool
 
@@ -383,7 +378,7 @@ class TracePoint
   #   rdoc-file=trace_point.rb
   #   - event()
   # -->
-  # Type of event
+  # Returns the type of event.
   #
   # See TracePoint@Events for more information.
   #
@@ -391,9 +386,9 @@ class TracePoint
 
   # <!--
   #   rdoc-file=trace_point.rb
-  #   - trace.inspect  -> string
+  #   - trace.inspect -> string
   # -->
-  # Return a string containing a human-readable TracePoint status.
+  # Returns a string containing a human-readable TracePoint status.
   #
   def inspect: () -> String
 
@@ -401,7 +396,7 @@ class TracePoint
   #   rdoc-file=trace_point.rb
   #   - lineno()
   # -->
-  # Line number of the event
+  # Returns the line number of the event.
   #
   def lineno: () -> Integer
 
@@ -409,7 +404,7 @@ class TracePoint
   #   rdoc-file=trace_point.rb
   #   - method_id()
   # -->
-  # Return the name at the definition of the method being called
+  # Returns the name at the definition of the method being called.
   #
   def method_id: () -> Symbol?
 
@@ -417,7 +412,7 @@ class TracePoint
   #   rdoc-file=trace_point.rb
   #   - path()
   # -->
-  # Path of the file being run
+  # Returns the path of the file being executed.
   #
   def path: () -> String
 
@@ -425,8 +420,8 @@ class TracePoint
   #   rdoc-file=trace_point.rb
   #   - parameters()
   # -->
-  # Return the parameters definition of the method or block that the current hook
-  # belongs to. Format is the same as for Method#parameters
+  # Returns the parameter definitions of the method or block that the current hook
+  # belongs to. The format is the same as for Method#parameters.
   #
   def parameters: () -> Method::param_types?
 
@@ -434,7 +429,7 @@ class TracePoint
   #   rdoc-file=trace_point.rb
   #   - raised_exception()
   # -->
-  # Value from exception raised on the `:raise` event, or rescued on the `:rescue`
+  # Returns the exception raised on the `:raise` event or rescued on the `:rescue`
   # event.
   #
   def raised_exception: () -> Exception
@@ -443,7 +438,7 @@ class TracePoint
   #   rdoc-file=trace_point.rb
   #   - return_value()
   # -->
-  # Return value from `:return`, `:c_return`, and `:b_return` event
+  # Returns the return value from `:return`, `:c_return`, and `:b_return` events.
   #
   def return_value: () -> untyped
 
@@ -451,9 +446,9 @@ class TracePoint
   #   rdoc-file=trace_point.rb
   #   - self()
   # -->
-  # Return the trace object during event
+  # Returns the trace object during the event.
   #
-  # Same as the following, except it returns the correct object (the method
+  # Similar to the following, but it returns the correct object (the method
   # receiver) for `:c_call` and `:c_return` events:
   #
   #     trace.binding.eval('self')
@@ -464,8 +459,8 @@ class TracePoint
   #   rdoc-file=trace_point.rb
   #   - eval_script()
   # -->
-  # Compiled source code (String) on *eval methods on the `:script_compiled`
-  # event. If loaded from a file, it will return nil.
+  # Returns the compiled source code (String) from eval methods on the
+  # `:script_compiled` event. If loaded from a file, it returns `nil`.
   #
   def eval_script: () -> String?
 
@@ -473,10 +468,10 @@ class TracePoint
   #   rdoc-file=trace_point.rb
   #   - instruction_sequence()
   # -->
-  # Compiled instruction sequence represented by a RubyVM::InstructionSequence
-  # instance on the `:script_compiled` event.
+  # Returns the compiled instruction sequence represented by a
+  # RubyVM::InstructionSequence instance on the `:script_compiled` event.
   #
-  # Note that this method is MRI specific.
+  # Note that this method is CRuby-specific.
   #
   def instruction_sequence: () -> RubyVM::InstructionSequence
 end

data/ext/rbs_extension/parser.c

@@ -1220,7 +1220,7 @@ static VALUE parse_type_params(parserstate *state, range *rg, bool module_type_p
 
       VALUE location = rbs_new_location(state->buffer, param_range);
       rbs_loc *loc = rbs_check_location(location);
-      rbs_loc_alloc_children(loc, 4);
+      rbs_loc_alloc_children(loc, 5);
       rbs_loc_add_required_child(loc, rb_intern("name"), name_range);
       rbs_loc_add_optional_child(loc, rb_intern("variance"), variance_range);
       rbs_loc_add_optional_child(loc, rb_intern("unchecked"), unchecked_range);

data/lib/rbs/types.rb

@@ -1427,6 +1427,7 @@ module RBS
       def each_type(&block)
         if block
           type.each_type(&block)
+          yield self_type if self_type
           self.block&.type&.each_type(&block)
           if self_type = self.block&.self_type
             yield self_type
@@ -1467,7 +1468,7 @@ module RBS
       end
 
       def with_nonreturn_void?
-        if type.with_nonreturn_void?
+        if type.with_nonreturn_void? || self_type&.with_nonreturn_void?
           true
         else
           if block = block()

data/lib/rbs/version.rb

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