typeprof 0.32.0 → 0.33.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 93757a88e1532a3e0d9faf5b3eb8690b7a61ced6027e28d49dfce43234557015
-  data.tar.gz: 8e41f82794582ea68445e0972a6cab30982fcac483a50c5032811e3a2fcb9a60
+  metadata.gz: 8dc7b580d84d82c2a49d4a2d24ddf32ddcafc938d4f9511fc4b6d4543f0b8e19
+  data.tar.gz: eed64be210440c2ea2627a7b21c95c7eedee374b760e9e6aa479dfa4c27df54f
 SHA512:
-  metadata.gz: f1020867309edd82548dd3bcfc84d22007324af9c6acd0e6c82bb002678dfef3bb7acc695f6cc19d243d24084871a3a7a0695b1d7f069122ab28a221fca06469
-  data.tar.gz: 17cf614ed4edd5e75c772750fe844db59d65dcf7dc129b22269e4a840dbf4a45c1136f7ed74ac780d37d183f08de24e2ca447cd1804ea39bc39e7876f393ede8
+  metadata.gz: b314eccaecb06cac94df1af7ab96084b06d1d70710c9ece6934c98ca5379ca98e82ab93838322081357d13c0200681beb24d6108f699aac4a8904952333a7d83
+  data.tar.gz: 7ebcd55f8c8d91b1eac583c7d585723de31a83da5fa85c7485cda77e520e24d09f1652b1dde7657db62c8151166cbfdc71d3563647ccd60871bb31e74fc6055a

data/lib/typeprof/core/ast/base.rb

@@ -118,6 +118,19 @@ module TypeProf::Core
         raise "should override"
       end
 
+      # Counterpart of install/install0 for pattern position; reuses the install
+      # machinery so @changes is reconciled the same way during incremental analysis.
+      def install_pattern(genv, subject)
+        @ret = install_pattern0(genv, subject)
+        @changes.reinstall(genv)
+        @ret
+      end
+
+      # By default a pattern behaves as a plain expression, ignoring the matched value.
+      def install_pattern0(genv, subject)
+        install0(genv)
+      end
+
       def uninstall(genv)
         @changes.reinstall(genv)
         each_subnode do |subnode|

data/lib/typeprof/core/ast/call.rb

@@ -1,12 +1,12 @@
 module TypeProf::Core
   class AST
     class CallBaseNode < Node
-      def initialize(raw_node, recv, mid, mid_code_range, raw_args, last_arg, raw_block, lenv, forwarding_arguments: false)
+      def initialize(raw_node, recv, mid, mid_code_range_loc, raw_args, last_arg, raw_block, lenv, forwarding_arguments: false)
         super(raw_node, lenv)
 
         @recv = recv
         @mid = mid
-        @mid_code_range = mid_code_range
+        @mid_code_range_loc = mid_code_range_loc
 
         # args
         @positional_args = []
@@ -31,7 +31,7 @@ module TypeProf::Core
               args << raw_arg.expression
               @splat_flags << true
             when Prism::ForwardingArgumentsNode
-              @forwarding_arguments = true
+              @forwarding_arguments = :rest
             else
               args << raw_arg
               @splat_flags << false
@@ -60,17 +60,24 @@ module TypeProf::Core
             @block_multi_targets = {}
             @block_f_args = case raw_block.parameters
                             when Prism::BlockParametersNode
+                              # `{ || ... }` (empty pipes) and `{ |; x| ... }`
+                              # (block-local-only) yield BlockParametersNode
+                              # whose inner `parameters` is nil.
                               params = raw_block.parameters.parameters
-                              req = params.requireds.each_with_index.map do |n, i|
-                                if n.is_a?(Prism::MultiTargetNode)
-                                  @block_multi_targets[i] = n
-                                  nil
-                                else
-                                  n.name
+                              if params
+                                req = params.requireds.each_with_index.map do |n, i|
+                                  if n.is_a?(Prism::MultiTargetNode)
+                                    @block_multi_targets[i] = n
+                                    nil
+                                  else
+                                    n.name
+                                  end
                                 end
+                                opt = params.optionals.map {|n| n.name }
+                                req + opt
+                              else
+                                []
                               end
-                              opt = params.optionals.map {|n| n.name }
-                              req + opt
                             when Prism::NumberedParametersNode
                               1.upto(raw_block.parameters.maximum).map { |n| :"_#{n}" }
                             when Prism::ItParametersNode
@@ -83,7 +90,7 @@ module TypeProf::Core
             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)
+            if raw_block.parameters.is_a?(Prism::BlockParametersNode) && raw_block.parameters.parameters
               raw_block.parameters.parameters.optionals.each do |n|
                 @block_opt_positional_defaults << AST.create_node(n.value, nlenv)
               end
@@ -95,7 +102,11 @@ module TypeProf::Core
         @yield = raw_node.type == :yield_node
       end
 
-      attr_reader :recv, :mid, :mid_code_range, :yield
+      attr_reader :recv, :mid, :yield
+
+      def mid_code_range
+        @mid_code_range ||= @lenv.code_range_from_node(@mid_code_range_loc) if @mid_code_range_loc
+      end
       attr_reader :positional_args, :splat_flags, :keyword_args
       attr_reader :block_tbl, :block_f_args, :block_opt_positional_defaults, :block_body, :block_pass, :anonymous_block_forwarding
       attr_reader :block_multi_targets
@@ -113,10 +124,17 @@ module TypeProf::Core
         end
 
         if @forwarding_arguments
-          forward_a_args = (@lenv.forward_args || raise).to_actual_arguments(genv, @changes, self)
-          positional_args = forward_a_args.positionals
-          splat_flags = forward_a_args.splat_flags
-          keyword_args = forward_a_args.keywords
+          forward_a_args = (@lenv.forward_args || raise).to_actual_arguments(
+            genv,
+            @changes,
+            self,
+            include_leading_positionals: @forwarding_arguments != :rest,
+            activation_required: @forwarding_arguments == :rest,
+          )
+          # An anonymous rest cannot appear here: `bar(*, ...)` is a syntax error
+          leading_args = @positional_args.map {|arg| arg.install(genv) }
+          a_args = forward_a_args.prepend_positionals(leading_args, @splat_flags)
+          a_args = a_args.with_keywords(@keyword_args.install(genv)) if @keyword_args
         else
           positional_args = @positional_args.map do |arg|
             if arg.nil?
@@ -125,8 +143,7 @@ module TypeProf::Core
               arg.install(genv)
             end
           end
-          splat_flags = @splat_flags
-          keyword_args = @keyword_args ? @keyword_args.install(genv) : nil
+          a_args = ActualArguments.new(positional_args, @splat_flags, @keyword_args ? @keyword_args.install(genv) : nil, nil)
         end
 
         if @block_body
@@ -198,7 +215,11 @@ module TypeProf::Core
           blk_ty = forward_a_args.block
         end
 
-        a_args = ActualArguments.new(positional_args, splat_flags, keyword_args, blk_ty)
+        if @forwarding_arguments
+          a_args = a_args.with_block(blk_ty, omittable: !@block_body && !@block_pass && !@anonymous_block_forwarding)
+        else
+          a_args = a_args.with_block(blk_ty)
+        end
         box = @changes.add_method_call_box(genv, recv, @mid, a_args, !@recv)
 
         block_body = @block_body
@@ -230,7 +251,7 @@ module TypeProf::Core
       end
 
       def retrieve_at(pos, &blk)
-        yield self if @mid_code_range && @mid_code_range.include?(pos)
+        yield self if mid_code_range&.include?(pos)
         each_subnode do |subnode|
           next unless subnode
           subnode.retrieve_at(pos, &blk)
@@ -257,10 +278,9 @@ module TypeProf::Core
       def initialize(raw_node, lenv)
         recv = raw_node.receiver ? AST.create_node(raw_node.receiver, lenv) : nil
         mid = raw_node.name
-        mid_code_range = lenv.code_range_from_node(raw_node.message_loc) if raw_node.message_loc
         raw_args = raw_node.arguments
         raw_block = raw_node.block
-        super(raw_node, recv, mid, mid_code_range, raw_args, nil, raw_block, lenv)
+        super(raw_node, recv, mid, raw_node.message_loc, raw_args, nil, raw_block, lenv)
       end
 
       def narrowings
@@ -317,7 +337,7 @@ module TypeProf::Core
       def initialize(raw_node,  lenv)
         raw_args = nil
         raw_block = raw_node.block
-        super(raw_node, nil, :"*super", nil, raw_args, nil, raw_block, lenv, forwarding_arguments: true)
+        super(raw_node, nil, :"*super", nil, raw_args, nil, raw_block, lenv, forwarding_arguments: :all)
       end
     end
 
@@ -331,9 +351,8 @@ module TypeProf::Core
     class OperatorNode < CallBaseNode
       def initialize(raw_node, recv, lenv)
         mid = raw_node.binary_operator
-        mid_code_range = lenv.code_range_from_node(raw_node.binary_operator_loc)
         last_arg = AST.create_node(raw_node.value, lenv)
-        super(raw_node, recv, mid, mid_code_range, nil, last_arg, nil, lenv)
+        super(raw_node, recv, mid, raw_node.binary_operator_loc, nil, last_arg, nil, lenv)
       end
     end
 
@@ -364,8 +383,7 @@ module TypeProf::Core
       def initialize(raw_node, lenv)
         recv = AST.create_node(raw_node.receiver, lenv)
         mid = raw_node.read_name
-        mid_code_range = lenv.code_range_from_node(raw_node.message_loc)
-        super(raw_node, recv, mid, mid_code_range, nil, nil, nil, lenv)
+        super(raw_node, recv, mid, raw_node.message_loc, nil, nil, nil, lenv)
       end
     end
 
@@ -373,9 +391,8 @@ module TypeProf::Core
       def initialize(raw_node, rhs, lenv)
         recv = AST.create_node(raw_node.receiver, lenv)
         mid = raw_node.is_a?(Prism::CallTargetNode) ? raw_node.name : raw_node.write_name
-        mid_code_range = lenv.code_range_from_node(raw_node.message_loc)
         @rhs = rhs
-        super(raw_node, recv, mid, mid_code_range, nil, rhs, nil, lenv)
+        super(raw_node, recv, mid, raw_node.message_loc, nil, rhs, nil, lenv)
       end
 
       attr_reader :rhs

data/lib/typeprof/core/ast/const.rb

@@ -8,7 +8,7 @@ module TypeProf::Core
           @cbase = nil
           @toplevel = false
           @cname = raw_node.name
-          @cname_code_range = lenv.code_range_from_node(raw_node.location)
+          @cname_code_range_loc = raw_node.location
         when :constant_path_node, :constant_path_target_node
           if raw_node.parent
             @cbase = AST.create_node(raw_node.parent, lenv)
@@ -18,14 +18,18 @@ module TypeProf::Core
             @toplevel = true
           end
           @cname = raw_node.name
-          @cname_code_range = lenv.code_range_from_node(raw_node.name_loc)
+          @cname_code_range_loc = raw_node.name_loc
         else
           raise raw_node.type.to_s
         end
         @strict_const_scope = lenv.strict_const_scope
       end
 
-      attr_reader :cname, :cbase, :toplevel, :cname_code_range, :strict_const_scope
+      attr_reader :cname, :cbase, :toplevel, :strict_const_scope
+
+      def cname_code_range
+        @cname_code_range ||= @lenv.code_range_from_node(@cname_code_range_loc) if @cname_code_range_loc
+      end
 
       def attrs = { cname:, toplevel:, strict_const_scope: }
       def subnodes = { cbase: }
@@ -57,24 +61,28 @@ module TypeProf::Core
           # C = expr
           @cpath = nil
           @static_cpath = lenv.cref.cpath + [raw_node.name]
-          @cname_code_range = lenv.code_range_from_node(raw_node.respond_to?(:name_loc) ? raw_node.name_loc : raw_node)
+          @cname_code_range_loc = raw_node.respond_to?(:name_loc) ? raw_node.name_loc : raw_node.location
         when :constant_path_write_node, :constant_path_operator_write_node, :constant_path_or_write_node, :constant_path_and_write_node
           # expr::C = expr
           @cpath = AST.create_node(raw_node.target, lenv)
           @static_cpath = AST.parse_cpath(raw_node.target, lenv.cref)
-          @cname_code_range = lenv.code_range_from_node(raw_node.target)
+          @cname_code_range_loc = raw_node.target.location
         when :constant_path_target_node
           # expr::C, * = ary
           @cpath = ConstantReadNode.new(raw_node, lenv)
           @static_cpath = AST.parse_cpath(raw_node, lenv.cref)
-          @cname_code_range = lenv.code_range_from_node(raw_node)
+          @cname_code_range_loc = raw_node.location
         else
           raise
         end
         @rhs = rhs
       end
 
-      attr_reader :cpath, :rhs, :static_cpath, :cname_code_range
+      attr_reader :cpath, :rhs, :static_cpath
+
+      def cname_code_range
+        @cname_code_range ||= @lenv.code_range_from_node(@cname_code_range_loc) if @cname_code_range_loc
+      end
 
       def subnodes = { cpath:, rhs: }
       def attrs = { static_cpath: }

data/lib/typeprof/core/ast/control.rb

@@ -414,9 +414,9 @@ module TypeProf::Core
 
       def install0(genv)
         ret = Vertex.new(self)
-        @pivot&.install(genv)
+        subject = @pivot ? @pivot.install(genv) : Source.new(genv.nil_type)
         @patterns.zip(@clauses) do |pattern, clause|
-          pattern.install(genv)
+          pattern.install_pattern(genv, subject)
           @changes.add_edge(genv, clause.install(genv), ret)
         end
         @changes.add_edge(genv, @else_clause.install(genv), ret) if @else_clause

data/lib/typeprof/core/ast/meta.rb

@@ -46,9 +46,56 @@ module TypeProf::Core
       end
     end
 
+    class ExtendMetaNode < Node
+      def initialize(raw_node, lenv)
+        super(raw_node, lenv)
+        # TODO: error for splat
+        @args = raw_node.arguments.arguments.map do |raw_arg|
+          next if raw_arg.is_a?(Prism::SplatNode)
+          lenv.use_strict_const_scope do
+            AST.create_node(raw_arg, lenv)
+          end
+        end.compact
+        # TODO: error for non-LIT
+        # TODO: fine-grained hover
+      end
+
+      attr_reader :args
+
+      def subnodes = { args: }
+
+      def define0(genv)
+        mod = genv.resolve_cpath(@lenv.cref.cpath)
+        @args.each do |arg|
+          arg.define(genv)
+          if arg.static_ret
+            arg.static_ret.followers << mod
+            mod.add_extend_def(genv, arg)
+          end
+        end
+      end
+
+      def undefine0(genv)
+        mod = genv.resolve_cpath(@lenv.cref.cpath)
+        @args.each do |arg|
+          if arg.static_ret
+            mod.remove_extend_def(genv, arg)
+          end
+          arg.undefine(genv)
+        end
+        super(genv)
+      end
+
+      def install0(genv)
+        @args.each {|arg| arg.install(genv) }
+        Source.new
+      end
+    end
+
     class AttrReaderMetaNode < Node
       def initialize(raw_node, lenv)
         super(raw_node, lenv)
+        @singleton = lenv.cref.scope_level == :metaclass
         @args = []
         raw_node.arguments.arguments.each do |raw_arg|
           @args << raw_arg.value.to_sym if raw_arg.type == :symbol_node
@@ -57,9 +104,9 @@ module TypeProf::Core
         # TODO: fine-grained hover
       end
 
-      attr_reader :args
+      attr_reader :singleton, :args
 
-      def attrs = { args: }
+      def attrs = { singleton:, args: }
 
       def req_positionals = []
       def opt_positionals = []
@@ -68,6 +115,7 @@ module TypeProf::Core
       def req_keywords = []
       def opt_keywords = []
       def rest_keywords = nil
+      def no_keywords = false
 
       def mname_code_range(name)
         idx = @args.index(name.to_sym) # TODO: support string args
@@ -78,9 +126,9 @@ module TypeProf::Core
       def install0(genv)
         @args.each do |arg|
           ivar_name = :"@#{ arg }"
-          ivar_box = @changes.add_ivar_read_box(genv, @lenv.cref.cpath, false, ivar_name)
+          ivar_box = @changes.add_ivar_read_box(genv, @lenv.cref.cpath, @singleton, ivar_name)
           ret_box = @changes.add_escape_box(genv, ivar_box.ret)
-          @changes.add_method_def_box(genv, @lenv.cref.cpath, false, arg, FormalArguments::Empty, [ret_box])
+          @changes.add_method_def_box(genv, @lenv.cref.cpath, @singleton, arg, FormalArguments::Empty, [ret_box])
         end
         Source.new
       end
@@ -89,15 +137,22 @@ module TypeProf::Core
     class AttrWriterMetaNode < Node
       def initialize(raw_node, lenv)
         super(raw_node, lenv)
+        @singleton = lenv.cref.scope_level == :metaclass
         @args = []
         raw_node.arguments.arguments.each do |raw_arg|
           @args << raw_arg.value.to_sym if raw_arg.type == :symbol_node
         end
       end
 
-      attr_reader :args
+      attr_reader :singleton, :args
 
-      def attrs = { args: }
+      def attrs = { singleton:, args: }
+
+      # Interface expected by MethodDefBox
+      def req_keywords = []
+      def opt_keywords = []
+      def rest_keywords = nil
+      def no_keywords = false
 
       def mname_code_range(name)
         idx = @args.index(name.to_sym)
@@ -107,7 +162,7 @@ module TypeProf::Core
 
       def define0(genv)
         @args.map do |arg|
-          mod = genv.resolve_ivar(lenv.cref.cpath, false, :"@#{ arg }")
+          mod = genv.resolve_ivar(lenv.cref.cpath, @singleton, :"@#{ arg }")
           mod.add_def(self)
           mod
         end
@@ -115,7 +170,7 @@ module TypeProf::Core
 
       def define_copy(genv)
         @args.map do |arg|
-          mod = genv.resolve_ivar(lenv.cref.cpath, false, :"@#{ arg }")
+          mod = genv.resolve_ivar(lenv.cref.cpath, @singleton, :"@#{ arg }")
           mod.add_def(self)
           mod.remove_def(@prev_node)
           mod
@@ -125,7 +180,7 @@ module TypeProf::Core
 
       def undefine0(genv)
         @args.each do |arg|
-          mod = genv.resolve_ivar(lenv.cref.cpath, false, :"@#{ arg }")
+          mod = genv.resolve_ivar(lenv.cref.cpath, @singleton, :"@#{ arg }")
           mod.remove_def(self)
         end
       end
@@ -136,7 +191,7 @@ module TypeProf::Core
           @changes.add_edge(genv, vtx, ive.vtx)
           ret_box = @changes.add_escape_box(genv, vtx)
           f_args = FormalArguments.new([vtx], [], nil, [], [], [], nil, nil)
-          @changes.add_method_def_box(genv, @lenv.cref.cpath, false, :"#{ arg }=", f_args, [ret_box])
+          @changes.add_method_def_box(genv, @lenv.cref.cpath, @singleton, :"#{ arg }=", f_args, [ret_box])
         end
         Source.new
       end
@@ -145,6 +200,7 @@ module TypeProf::Core
     class AttrAccessorMetaNode < Node
       def initialize(raw_node, lenv)
         super(raw_node, lenv)
+        @singleton = lenv.cref.scope_level == :metaclass
         @args = []
         raw_node.arguments.arguments.each do |raw_arg|
           @args << raw_arg.value.to_sym if raw_arg.type == :symbol_node
@@ -153,9 +209,15 @@ module TypeProf::Core
         # TODO: fine-grained hover
       end
 
-      attr_reader :args
+      attr_reader :singleton, :args
 
-      def attrs = { args: }
+      def attrs = { singleton:, args: }
+
+      # Interface expected by MethodDefBox
+      def req_keywords = []
+      def opt_keywords = []
+      def rest_keywords = nil
+      def no_keywords = false
 
       def mname_code_range(name)
         idx = @args.index(name.to_sym) # TODO: support string args
@@ -165,7 +227,7 @@ module TypeProf::Core
 
       def define0(genv)
         @args.map do |arg|
-          mod = genv.resolve_ivar(lenv.cref.cpath, false, :"@#{ arg }")
+          mod = genv.resolve_ivar(lenv.cref.cpath, @singleton, :"@#{ arg }")
           mod.add_def(self)
           mod
         end
@@ -173,7 +235,7 @@ module TypeProf::Core
 
       def define_copy(genv)
         @args.map do |arg|
-          mod = genv.resolve_ivar(lenv.cref.cpath, false, :"@#{ arg }")
+          mod = genv.resolve_ivar(lenv.cref.cpath, @singleton, :"@#{ arg }")
           mod.add_def(self)
           mod.remove_def(@prev_node)
           mod
@@ -183,21 +245,21 @@ module TypeProf::Core
 
       def undefine0(genv)
         @args.each do |arg|
-          mod = genv.resolve_ivar(lenv.cref.cpath, false, :"@#{ arg }")
+          mod = genv.resolve_ivar(lenv.cref.cpath, @singleton, :"@#{ arg }")
           mod.remove_def(self)
         end
       end
 
       def install0(genv)
         @args.zip(@static_ret) do |arg, ive|
-          ivar_box = @changes.add_ivar_read_box(genv, @lenv.cref.cpath, false, :"@#{ arg }")
+          ivar_box = @changes.add_ivar_read_box(genv, @lenv.cref.cpath, @singleton, :"@#{ arg }")
           ret_box = @changes.add_escape_box(genv, ivar_box.ret)
-          @changes.add_method_def_box(genv, @lenv.cref.cpath, false, arg, FormalArguments::Empty, [ret_box])
+          @changes.add_method_def_box(genv, @lenv.cref.cpath, @singleton, arg, FormalArguments::Empty, [ret_box])
 
           vtx = Vertex.new(self)
           @changes.add_edge(genv, vtx, ive.vtx)
           f_args = FormalArguments.new([vtx], [], nil, [], [], [], nil, nil)
-          @changes.add_method_def_box(genv, @lenv.cref.cpath, false, :"#{ arg }=", f_args, [ret_box])
+          @changes.add_method_def_box(genv, @lenv.cref.cpath, @singleton, :"#{ arg }=", f_args, [ret_box])
         end
         Source.new
       end
@@ -234,6 +296,11 @@ module TypeProf::Core
 
       attr_reader :static_cpath, :members, :kind, :block_body
 
+      # Not a valid constant name, so no Ruby code can refer to it
+      BASE_CNAME = :"<struct base>"
+
+      def struct_base_cpath = @static_cpath + [BASE_CNAME]
+
       def subnodes = { block_body: }
       def attrs = { static_cpath:, members:, kind: }
 
@@ -251,8 +318,9 @@ module TypeProf::Core
         mod = genv.resolve_cpath(@static_cpath)
         # add_module_def internally calls get_const(name).add_def(self)
         cdef = mod.add_module_def(genv, self)
+        genv.resolve_cpath(struct_base_cpath).add_module_def(genv, self)
         @members.each do |member|
-          ive = genv.resolve_ivar(@static_cpath, false, member)
+          ive = genv.resolve_ivar(struct_base_cpath, false, member)
           ive.add_def(self)
         end
         @block_body.define(genv) if @block_body
@@ -263,8 +331,11 @@ module TypeProf::Core
         mod = genv.resolve_cpath(@static_cpath)
         mod.add_module_def(genv, self)
         mod.remove_module_def(genv, @prev_node)
+        base = genv.resolve_cpath(struct_base_cpath)
+        base.add_module_def(genv, self)
+        base.remove_module_def(genv, @prev_node)
         @members.each do |member|
-          ive = genv.resolve_ivar(@static_cpath, false, member)
+          ive = genv.resolve_ivar(struct_base_cpath, false, member)
           ive.add_def(self)
           ive.remove_def(@prev_node)
         end
@@ -274,8 +345,9 @@ module TypeProf::Core
       def undefine0(genv)
         mod = genv.resolve_cpath(@static_cpath)
         mod.remove_module_def(genv, self)
+        genv.resolve_cpath(struct_base_cpath).remove_module_def(genv, self)
         @members.each do |member|
-          ive = genv.resolve_ivar(@static_cpath, false, member)
+          ive = genv.resolve_ivar(struct_base_cpath, false, member)
           ive.remove_def(self)
         end
         @block_body.undefine(genv) if @block_body
@@ -288,7 +360,7 @@ module TypeProf::Core
           @changes.add_edge(genv, mod_val, @static_ret.vtx)
         end
 
-        cpath = @static_cpath
+        cpath = struct_base_cpath
         @members.each do |member|
           # Use bare `:member` (not `:@member`) so the slot can't collide with a
           # user-written @member ivar — Struct/Data fields are not real ivars.
@@ -325,7 +397,8 @@ module TypeProf::Core
 
         # Struct.[] is an alias for Struct.new
         if @kind == :struct
-          self_ret = @changes.add_escape_box(genv, Source.new(Type::Instance.new(genv, genv.resolve_cpath(cpath), [])))
+          # Struct.[] builds the struct class itself, not the base class
+          self_ret = @changes.add_escape_box(genv, Source.new(Type::Instance.new(genv, genv.resolve_cpath(@static_cpath), [])))
           @changes.add_method_def_box(genv, cpath, true, :[], init_f_args, [self_ret])
         end
 

data/lib/typeprof/core/ast/method.rb

@@ -135,7 +135,7 @@ module TypeProf::Core
         # TODO: warn "def self.foo" in a metaclass
         singleton = !!raw_node.receiver || lenv.cref.scope_level == :metaclass
         mid = raw_node.name
-        mid_code_range = lenv.code_range_from_node(raw_node.name_loc)
+        mid_code_range_loc = raw_node.name_loc
         @tbl = raw_node.locals
         raw_args = raw_node.parameters
         raw_body = raw_node.body
@@ -144,7 +144,7 @@ module TypeProf::Core
 
         @singleton = singleton
         @mid = mid
-        @mid_code_range = mid_code_range
+        @mid_code_range_loc = mid_code_range_loc
 
         ncref = CRef.new(lenv.cref.cpath, @singleton ? :class : :instance, @mid, lenv.cref)
         nlenv = LocalEnv.new(@lenv.file_context, ncref, {}, [])
@@ -177,7 +177,11 @@ module TypeProf::Core
         @reusable = !use_result
       end
 
-      attr_reader :singleton, :mid, :mid_code_range
+      attr_reader :singleton, :mid
+
+      def mid_code_range
+        @mid_code_range ||= @lenv.code_range_from_node(@mid_code_range_loc) if @mid_code_range_loc
+      end
       attr_reader :tbl
       attr_reader :req_positionals
       attr_reader :opt_positionals
@@ -203,7 +207,6 @@ module TypeProf::Core
       def attrs = {
         singleton:,
         mid:,
-        mid_code_range:,
         tbl:,
         req_positionals:,
         opt_positionals:,
@@ -217,7 +220,7 @@ module TypeProf::Core
         reusable:,
       }
 
-      def mname_code_range(_name) = @mid_code_range
+      def mname_code_range(_name) = mid_code_range
 
       def define(genv) # NOT define0
         return define_copy(genv) if @prev_node && @reusable
@@ -271,21 +274,22 @@ module TypeProf::Core
           block = @body.lenv.new_var(:"*given_block", self)
         end
 
-        forward_opt_positionals = @opt_positionals.map do
-          elem_vtx = Vertex.new(self)
-          [Source.new(genv.gen_ary_type(elem_vtx)), elem_vtx]
-        end
+        forward_opt_positionals = @opt_positionals.map { Vertex.new(self) }
+        forward_rest_positionals = @rest_positionals ? Vertex.new(self) : nil
         forward_opt_keywords = @opt_keywords.map {|_name| Vertex.new(self) }
+        forward_rest_keywords = @rest_keywords ? Vertex.new(self) : nil
+        forward_block = Vertex.new(self)
+        forward_activation = Vertex.new(self)
         @body.lenv.forward_args = ForwardingArguments.new(
           req_positionals,
-          forward_opt_positionals.map(&:first),
-          forward_opt_positionals.map(&:last),
-          rest_positionals,
+          forward_opt_positionals,
+          forward_rest_positionals,
           post_positionals,
           @req_keywords.zip(req_keywords),
           @opt_keywords.zip(forward_opt_keywords),
-          rest_keywords,
-          block,
+          forward_rest_keywords,
+          forward_block,
+          forward_activation,
         )
 
         if @body