Support optional parameters in block arguments

This allows blocks like `do |x, y = :default|`.

Author: mame

lib/typeprof/core/ast/call.rb

@@ -16,6 +16,7 @@ def initialize(raw_node, recv, mid, mid_code_range, raw_args, last_arg, raw_bloc
         @block_pass = nil
         @block_tbl = nil
         @block_f_args = nil
+        @block_opt_positional_defaults = nil
         @block_body = nil
         @safe_navigation = raw_node.respond_to?(:safe_navigation?) && raw_node.safe_navigation?
         @anonymous_block_forwarding = false
@@ -55,10 +56,12 @@ def initialize(raw_node, recv, mid, mid_code_range, raw_args, last_arg, raw_bloc
           else
             @block_pass = nil
             @block_tbl = raw_block.locals
-            # TODO: optional args, etc.
             @block_f_args = case raw_block.parameters
                             when Prism::BlockParametersNode
-                              raw_block.parameters.parameters.requireds.map {|n| n.is_a?(Prism::MultiTargetNode) ? nil : n.name }
+                              params = raw_block.parameters.parameters
+                              req = params.requireds.map {|n| n.is_a?(Prism::MultiTargetNode) ? nil : n.name }
+                              opt = params.optionals.map {|n| n.name }
+                              req + opt
                             when Prism::NumberedParametersNode
                               1.upto(raw_block.parameters.maximum).map { |n| :"_#{n}" }
                             when Prism::ItParametersNode
@@ -70,6 +73,12 @@ def initialize(raw_node, recv, mid, mid_code_range, raw_args, last_arg, raw_bloc
                             end
             ncref = CRef.new(lenv.cref.cpath, :instance, @mid, lenv.cref)
             nlenv = LocalEnv.new(@lenv.file_context, ncref, {}, @lenv.return_boxes)
+            @block_opt_positional_defaults = []
+            if raw_block.parameters.is_a?(Prism::BlockParametersNode)
+              raw_block.parameters.parameters.optionals.each do |n|
+                @block_opt_positional_defaults << AST.create_node(n.value, nlenv)
+              end
+            end
             @block_body = raw_block.body ? AST.create_node(raw_block.body, nlenv) : DummyNilNode.new(code_range, lenv)
           end
         end
@@ -79,10 +88,10 @@ def initialize(raw_node, recv, mid, mid_code_range, raw_args, last_arg, raw_bloc
 
       attr_reader :recv, :mid, :mid_code_range, :yield
       attr_reader :positional_args, :splat_flags, :keyword_args
-      attr_reader :block_tbl, :block_f_args, :block_body, :block_pass, :anonymous_block_forwarding
+      attr_reader :block_tbl, :block_f_args, :block_opt_positional_defaults, :block_body, :block_pass, :anonymous_block_forwarding
       attr_reader :safe_navigation
 
-      def subnodes = { recv:, positional_args:, keyword_args:, block_body:, block_pass: }
+      def subnodes = { recv:, positional_args:, keyword_args:, block_opt_positional_defaults:, block_body:, block_pass: }
       def attrs = { mid:, splat_flags:, block_tbl:, block_f_args:, yield:, safe_navigation:, anonymous_block_forwarding: }
 
       def install0(genv)
@@ -117,6 +126,13 @@ def install0(genv)
             end
           end
 
+          if @block_opt_positional_defaults && !@block_opt_positional_defaults.empty?
+            req_count = blk_f_args.size - @block_opt_positional_defaults.size
+            @block_opt_positional_defaults.each_with_index do |expr, i|
+              @changes.add_edge(genv, expr.install(genv), blk_f_args[req_count + i])
+            end
+          end
+
           @lenv.locals.each do |var, vtx|
             block_body.lenv.set_var(var, vtx)
           end

scenario/known-issues/block_optionals.rb scenario/block/block_optionals.rbscenario/known-issues/block_optionals.rb renamed to scenario/block/block_optionals.rb

@@ -23,6 +23,6 @@ def check2
 ## assert
 class Object
   def test_yield: { (Integer, Integer) -> bot } -> bot
-  def check1: -> [Integer, Integer]?
+  def check1: -> [Integer, :y | Integer]?
   def check2: -> [Integer, Integer, :z]?
 end