typeprof 0.12.0 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 239b17dbe8d61c729346c5dde966f6abff491951c88bc33c57c4c34cc99dc497
-  data.tar.gz: 2696c83796a6af5c498cca59a3d98b7faccaf187fe60c0057ac3f052622009ff
+  metadata.gz: 501623610b473ab2fdd870686387a26ae787b8e3af6254a7a443967acb0b9f17
+  data.tar.gz: 0ace065239fb606719b1a716c7ce38e312c3b1b07f238d3f1a67e66eaf261567
 SHA512:
-  metadata.gz: 23a7a3313dadd2d0c63a5d83a3afd112893134a049861e6a9e11cf5097aaa78c19494326b6a07b44cf4d93f5dec5a2c893b91fe2c4f5571726229d1e8dc13229
-  data.tar.gz: 3273f1bb24290af32db23aaae8cafa84905d4d2d576b5ab96178130fe843b73e4365827b60d47a022a2812621f7fe09a3801c32c205c9805516873ed9ac88659
+  metadata.gz: b5b437508d0b83d3966a07266cebef3aa64e98ef4b33e75cd9deb5a615019fdb054f00ffb433d2af573258192bfd7346845dc870db32540b928314999c8e818c
+  data.tar.gz: 2aaa6b88e7d41676d989b3ac01057af13cf7247569e68b9be57b919e210afa140d016e3d27522fa8f03362fa17a3fb46356d3be1bd770a251c825cb4477334e6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    typeprof (0.12.0)
+    typeprof (0.13.0)
       rbs (>= 1.0.0)
 
 GEM

data/lib/typeprof/analyzer.rb

@@ -42,6 +42,10 @@ module TypeProf
         "<builtin>"
       end
     end
+
+    def replace_cref(cref)
+      Context.new(@iseq, cref, @mid)
+    end
   end
 
   class TypedContext
@@ -61,6 +65,10 @@ module TypeProf
         "<typed-context:#{ @mid }>"
       end
     end
+
+    def replace_cref(cref)
+      # What to do?
+    end
   end
 
   class ExecutionPoint
@@ -86,6 +94,10 @@ module TypeProf
       ExecutionPoint.new(@ctx, @pc + 1, @outer)
     end
 
+    def replace_cref(cref)
+      ExecutionPoint.new(@ctx.replace_cref(cref), @pc, @outer)
+    end
+
     def source_location
       @ctx.source_location(@pc)
     end
@@ -238,6 +250,8 @@ module TypeProf
     end
 
     def initialize
+      @entrypoints = []
+
       @worklist = Utils::WorkList.new
 
       @ep2env = {}
@@ -272,6 +286,10 @@ module TypeProf
       @anonymous_struct_gen_id = 0
     end
 
+    def add_entrypoint(iseq)
+      @entrypoints << iseq
+    end
+
     attr_reader :return_envs, :loaded_features, :rbs_reader
 
     def get_env(ep)
@@ -878,56 +896,68 @@ module TypeProf
       iter_counter = 0
       stat_eps = Utils::MutableSet.new
 
-      while true
-        until @worklist.empty?
-          ep = @worklist.deletemin
-
-          iter_counter += 1
-          if Config.options[:show_indicator]
-            tick2 = Time.now
-            if tick2 - tick >= 1
-              tick = tick2
-              $stderr << "\rType Profiling... (%d instructions @ %s)\e[K" % [iter_counter, ep.source_location]
-              $stderr.flush
+      prologue_ctx = Context.new(nil, nil, nil)
+      prologue_ep = ExecutionPoint.new(prologue_ctx, -1, nil)
+      prologue_env = Env.new(StaticEnv.new(Type.bot, Type.nil, false, true), [], [], Utils::HashWrapper.new({}))
+
+      until @entrypoints.empty?
+        iseq = @entrypoints.shift
+        ep, env = TypeProf.starting_state(iseq)
+        merge_env(ep, env)
+        add_callsite!(ep.ctx, prologue_ep, prologue_env) {|ty, ep| }
+
+        while true
+          until @worklist.empty?
+            ep = @worklist.deletemin
+
+            iter_counter += 1
+            if Config.options[:show_indicator]
+              tick2 = Time.now
+              if tick2 - tick >= 1
+                tick = tick2
+                $stderr << "\rType Profiling... (%d instructions @ %s)\e[K" % [iter_counter, ep.source_location]
+                $stderr.flush
+              end
             end
-          end
 
-          if (Config.max_sec && Time.now - start_time >= Config.max_sec) || (Config.max_iter && Config.max_iter <= iter_counter)
-            @terminated = true
-            break
-          end
+            if (Config.max_sec && Time.now - start_time >= Config.max_sec) || (Config.max_iter && Config.max_iter <= iter_counter)
+              @terminated = true
+              break
+            end
 
-          stat_eps << ep
-          step(ep)
-        end
+            stat_eps << ep
+            step(ep)
+          end
 
-        break if @terminated
+          break if @terminated
 
-        break unless Config.options[:stub_execution]
+          break unless Config.options[:stub_execution]
 
-        begin
-          iseq, (kind, dummy_continuation) = @pending_execution.first
-          break if !iseq
-          @pending_execution.delete(iseq)
-        end while @executed_iseqs.include?(iseq)
+          begin
+            iseq, (kind, dummy_continuation) = @pending_execution.first
+            break if !iseq
+            @pending_execution.delete(iseq)
+          end while @executed_iseqs.include?(iseq)
 
-        puts "DEBUG: trigger stub execution (#{ iseq&.name || "(nil)" }): rest #{ @pending_execution.size }" if Config.verbose >= 2
+          puts "DEBUG: trigger stub execution (#{ iseq&.name || "(nil)" }): rest #{ @pending_execution.size }" if Config.verbose >= 2
 
-        break if !iseq
-        case kind
-        when :method
-          meth, ep, env = dummy_continuation
-          merge_env(ep, env)
-          add_iseq_method_call!(meth, ep.ctx)
-
-        when :block
-          blk, epenvs = dummy_continuation
-          epenvs.each do |ep, env|
+          break if !iseq
+          case kind
+          when :method
+            meth, ep, env = dummy_continuation
             merge_env(ep, env)
-            add_block_to_ctx!(blk.block_body, ep.ctx)
+            add_iseq_method_call!(meth, ep.ctx)
+
+          when :block
+            blk, epenvs = dummy_continuation
+            epenvs.each do |ep, env|
+              merge_env(ep, env)
+              add_block_to_ctx!(blk.block_body, ep.ctx)
+            end
           end
         end
       end
+
       $stderr.print "\r\e[K" if Config.options[:show_indicator]
 
       stat_eps
@@ -1245,7 +1275,13 @@ module TypeProf
             end
             if cbase.is_a?(Type::Class)
               klass = new_class(cbase, id, [], superclass, ep.ctx.iseq.absolute_path)
-              add_superclass_type_args!(klass, superclass.type_params.map { Type.any }) if superclass
+              if superclass
+                add_superclass_type_args!(klass, superclass.type_params.map { Type.any })
+
+                # inherited hook
+                aargs = ActualArguments.new([klass], nil, {}, Type.nil)
+                do_send(superclass, :inherited, aargs, ep, env) {|_ret_ty, _ep| }
+              end
             else
               klass = Type.any
             end
@@ -2091,10 +2127,10 @@ module TypeProf
       end
     end
 
-    def do_invoke_block(blk, aargs, ep, env, replace_recv_ty: nil, &ctn)
+    def do_invoke_block(blk, aargs, ep, env, replace_recv_ty: nil, replace_cref: nil, &ctn)
       blk.each_child do |blk|
         if blk.is_a?(Type::Proc)
-          blk.block_body.do_call(aargs, ep, env, self, replace_recv_ty: replace_recv_ty, &ctn)
+          blk.block_body.do_call(aargs, ep, env, self, replace_recv_ty: replace_recv_ty, replace_cref: replace_cref, &ctn)
         else
           warn(ep, "non-proc is passed as a block")
           ctn[Type.any, ep, env]

data/lib/typeprof/block.rb

@@ -27,7 +27,7 @@ module TypeProf
       self
     end
 
-    def do_call(aargs, caller_ep, caller_env, scratch, replace_recv_ty:, &ctn)
+    def do_call(aargs, caller_ep, caller_env, scratch, replace_recv_ty:, replace_cref:, &ctn)
       blk_env = scratch.return_envs[@outer_ep]
       if replace_recv_ty
         replace_recv_ty = scratch.globalize_type(replace_recv_ty, caller_env, caller_ep)
@@ -46,7 +46,8 @@ module TypeProf
         return
       end
 
-      nctx = Context.new(@iseq, @outer_ep.ctx.cref, nil)
+      cref = replace_cref || @outer_ep.ctx.cref
+      nctx = Context.new(@iseq, cref, nil)
       callee_ep = ExecutionPoint.new(nctx, 0, @outer_ep)
       nenv = Env.new(blk_env.static_env, locals, [], nil)
       alloc_site = AllocationSite.new(callee_ep)
@@ -87,7 +88,7 @@ module TypeProf
       TypedBlock.new(msig, ret_ty)
     end
 
-    def do_call(aargs, caller_ep, caller_env, scratch, replace_recv_ty:, &ctn)
+    def do_call(aargs, caller_ep, caller_env, scratch, replace_recv_ty:, replace_cref:, &ctn)
       aargs = scratch.globalize_type(aargs, caller_env, caller_ep)
       subst = aargs.consistent_with_method_signature?(@msig)
       unless subst
@@ -119,7 +120,7 @@ module TypeProf
       self
     end
 
-    def do_call(aargs, caller_ep, caller_env, scratch, replace_recv_ty:, &ctn)
+    def do_call(aargs, caller_ep, caller_env, scratch, replace_recv_ty:, replace_cref:, &ctn)
       if aargs.lead_tys.size >= 1
         recv = aargs.lead_tys[0]
         recv = Type.any if recv == Type.bot
@@ -157,7 +158,7 @@ module TypeProf
       self
     end
 
-    def do_call(aargs, caller_ep, caller_env, scratch, replace_recv_ty:, &ctn)
+    def do_call(aargs, caller_ep, caller_env, scratch, replace_recv_ty:, replace_cref:, &ctn)
       aargs = scratch.globalize_type(aargs, caller_env, caller_ep)
 
       dummy_ctx = TypedContext.new(@caller_ep, @mid)
@@ -165,7 +166,7 @@ module TypeProf
       scratch.add_block_signature!(self, aargs.to_block_signature)
       scratch.add_block_to_ctx!(self, dummy_ctx)
 
-      @blk.call(aargs, caller_ep, caller_env, scratch, replace_recv_ty: replace_recv_ty) do |ret_ty, ep, env|
+      @blk.call(aargs, caller_ep, caller_env, scratch, replace_recv_ty: replace_recv_ty, replace_cref: replace_cref) do |ret_ty, ep, env|
         scratch.add_return_value!(dummy_ctx, ret_ty)
         ctn[ret_ty, ep, env]
       end

data/lib/typeprof/builtin.rb

@@ -158,7 +158,22 @@ module TypeProf
       naargs = ActualArguments.new([recv], nil, {}, Type.nil)
       nrecv = recv
       nrecv = nrecv.base_type if nrecv.is_a?(Type::ContainerType)
-      scratch.do_invoke_block(aargs.blk_ty, naargs, ep, env, replace_recv_ty: nrecv) do |_ret_ty, ep|
+      scratch.do_invoke_block(aargs.blk_ty, naargs, ep, env, replace_recv_ty: nrecv) do |ret_ty, ep|
+        ctn[ret_ty, ep, env]
+      end
+    end
+
+    def object_module_eval(recv, mid, aargs, ep, env, scratch, &ctn)
+      if aargs.lead_tys.size >= 1
+        scratch.warn(ep, "class_eval with arguments is ignored")
+        ctn[Type.any, ep, env]
+        return
+      end
+      naargs = ActualArguments.new([recv], nil, {}, Type.nil)
+      nrecv = recv
+      nrecv = nrecv.base_type if nrecv.is_a?(Type::ContainerType)
+      ncref = ep.ctx.cref.extend(nrecv, true)
+      scratch.do_invoke_block(aargs.blk_ty, naargs, ep, env, replace_recv_ty: nrecv, replace_cref: ncref) do |_ret_ty, ep|
         ctn[recv, ep, env]
       end
     end
@@ -176,7 +191,7 @@ module TypeProf
       end
 
       elem_ty = Type.bot
-      enum_for_blk = CustomBlock.new(ep, mid) do |aargs, caller_ep, caller_env, scratch, replace_recv_ty:, &blk_ctn|
+      enum_for_blk = CustomBlock.new(ep, mid) do |aargs, caller_ep, caller_env, scratch, replace_recv_ty:, replace_cref:, &blk_ctn|
         if aargs.lead_tys.size >= 1
           elem_ty = elem_ty.union(aargs.lead_tys[0])
         else
@@ -235,9 +250,12 @@ module TypeProf
         return ctn[Type.any, ep, env]
       end
 
+      # support multiple arguments: include M1, M2
       arg = aargs.lead_tys[0]
       arg.each_child do |arg|
         if arg.is_a?(Type::Class)
+          aargs = ActualArguments.new([recv], nil, {}, Type.nil)
+          scratch.do_send(arg, :included, aargs, ep, env) {|_ret_ty, _ep| }
           scratch.mix_module(:after, recv, arg, nil, ep.ctx.cref.singleton, ep)
         end
       end
@@ -259,6 +277,8 @@ module TypeProf
       arg = aargs.lead_tys[0]
       arg.each_child do |arg|
         if arg.is_a?(Type::Class)
+          aargs = ActualArguments.new([recv], nil, {}, Type.nil)
+          scratch.do_send(arg, :extended, aargs, ep, env) {|_ret_ty, _ep| }
           # if ep.ctx.cref.singleton is true, the meta-meta level is ignored. Should we warn?
           scratch.mix_module(:after, recv, arg, nil, true, ep)
         end
@@ -804,9 +824,11 @@ module TypeProf
       scratch.set_custom_method(klass_module, :public, Builtin.method(:module_public), false)
       scratch.set_custom_method(klass_module, :private, Builtin.method(:module_private), false)
       scratch.set_custom_method(klass_module, :define_method, Builtin.method(:module_define_method))
-      scratch.set_custom_method(klass_module, :"attr_accessor", Builtin.method(:module_attr_accessor))
-      scratch.set_custom_method(klass_module, :"attr_reader", Builtin.method(:module_attr_reader))
-      scratch.set_custom_method(klass_module, :"attr_writer", Builtin.method(:module_attr_writer))
+      scratch.set_custom_method(klass_module, :attr_accessor, Builtin.method(:module_attr_accessor))
+      scratch.set_custom_method(klass_module, :attr_reader, Builtin.method(:module_attr_reader))
+      scratch.set_custom_method(klass_module, :attr_writer, Builtin.method(:module_attr_writer))
+      scratch.set_custom_method(klass_module, :class_eval, Builtin.method(:object_module_eval))
+      scratch.set_custom_method(klass_module, :module_eval, Builtin.method(:object_module_eval))
 
       scratch.set_custom_method(klass_proc, :[], Builtin.method(:proc_call))
       scratch.set_custom_method(klass_proc, :call, Builtin.method(:proc_call))

data/lib/typeprof/config.rb

@@ -80,21 +80,6 @@ module TypeProf
       Import.import_library(scratch, feature)
     end
 
-    prologue_ctx = Context.new(nil, nil, nil)
-    prologue_ep = ExecutionPoint.new(prologue_ctx, -1, nil)
-    prologue_env = Env.new(StaticEnv.new(Type.bot, Type.nil, false, true), [], [], Utils::HashWrapper.new({}))
-
-    Config.rb_files.each do |rb|
-      if rb.is_a?(Array) # [String name, String content]
-        iseq = ISeq.compile_str(*rb.reverse)
-      else
-        iseq = ISeq.compile(rb)
-      end
-      ep, env = TypeProf.starting_state(iseq)
-      scratch.merge_env(ep, env)
-      scratch.add_callsite!(ep.ctx, prologue_ep, prologue_env) {|ty, ep| }
-    end
-
     rbs_files = []
     rbs_codes = []
     Config.rbs_files.each do |rbs|
@@ -109,6 +94,15 @@ module TypeProf
       Import.import_rbs_code(scratch, name, content)
     end
 
+    Config.rb_files.each do |rb|
+      if rb.is_a?(Array) # [String name, String content]
+        iseq = ISeq.compile_str(*rb.reverse)
+      else
+        iseq = ISeq.compile(rb)
+      end
+      scratch.add_entrypoint(iseq)
+    end
+
     result = scratch.type_profile
 
     if Config.output.respond_to?(:write)

data/lib/typeprof/export.rb

@@ -137,18 +137,17 @@ module TypeProf
             ctxs = @iseq_method_to_ctxs[mdef]
             next unless ctxs
 
-            ctxs.each do |ctx|
-              next if mid != ctx.mid
-              next if Config.check_dir_filter(ctx.iseq.absolute_path) == :exclude
+            ctx = ctxs.find {|ctx| ctx.mid == mid } || ctxs.first
 
-              method_name = ctx.mid
-              method_name = "self.#{ method_name }" if singleton
+            next if Config.check_dir_filter(ctx.iseq.absolute_path) == :exclude
 
-              key = [:iseq, method_name]
-              visibilities[key] ||= mdef.pub_meth
-              source_locations[key] ||= ctx.iseq.source_location(0)
-              (methods[key] ||= []) << @scratch.show_method_signature(ctx)
-            end
+            method_name = mid
+            method_name = "self.#{ method_name }" if singleton
+
+            key = [:iseq, method_name]
+            visibilities[key] ||= mdef.pub_meth
+            source_locations[key] ||= ctx.iseq.source_location(0)
+            (methods[key] ||= []) << @scratch.show_method_signature(ctx)
           when AliasMethodDef
             alias_name, orig_name = mid, mdef.orig_mid
             if singleton

data/lib/typeprof/import.rb

@@ -189,11 +189,15 @@ module TypeProf
             when RBS::AST::Members::Include
               name = member.name
               if name.kind == :class
+                # including a module
                 mod = conv_type_name(name)
                 type_args = member.args.map {|type| conv_type(type) }
                 modules[:include] << [mod, type_args]
               else
-                # including an interface is not supported yet
+                # including an interface
+                mod = conv_type_name(name)
+                type_args = member.args.map {|type| conv_type(type) }
+                modules[:include] << [mod, type_args]
               end
 
             when RBS::AST::Members::Extend

data/lib/typeprof/version.rb

@@ -1,3 +1,3 @@
 module TypeProf
-  VERSION = "0.12.0"
+  VERSION = "0.13.0"
 end

data/smoke/class_eval.rb

@@ -0,0 +1,22 @@
+module Foo
+end
+
+module Bar
+  Foo.class_eval do
+    @foo = self
+    def foo
+      "str"
+    end
+  end
+end
+
+__END__
+# Classes
+module Foo
+  self.@foo: singleton(Foo)
+
+  def self.foo: -> String
+end
+
+module Bar
+end

data/smoke/define_method7.rb

@@ -0,0 +1,18 @@
+class Human
+  define_method(:fo) { }
+  
+  [:a, :b].each { |m|
+    define_method(m) { }
+  }
+end
+
+Human.new.a
+Human.new.b
+
+__END__
+# Classes
+class Human
+  def fo: -> nil
+  def a: -> nil
+  def b: -> nil
+end

data/smoke/extended.rb

@@ -0,0 +1,38 @@
+module Foo
+  @extended = []
+  def self.extended(klass)
+    @extended << klass
+  end
+end
+
+class C
+  extend Foo
+end
+
+class D
+  extend Foo
+end
+
+class E
+  extend Foo
+end
+
+__END__
+# Classes
+module Foo
+  self.@extended: Array[singleton(C) | singleton(D) | singleton(E)]
+
+  def self.extended: (singleton(C) | singleton(D) | singleton(E) klass) -> (Array[singleton(C) | singleton(D) | singleton(E)])
+end
+
+class C
+  extend Foo
+end
+
+class D
+  extend Foo
+end
+
+class E
+  extend Foo
+end

data/smoke/included.rb

@@ -0,0 +1,38 @@
+module Foo
+  @included = []
+  def self.included(klass)
+    @included << klass
+  end
+end
+
+class C
+  include Foo
+end
+
+class D
+  include Foo
+end
+
+class E
+  include Foo
+end
+
+__END__
+# Classes
+module Foo
+  self.@included: Array[singleton(C) | singleton(D) | singleton(E)]
+
+  def self.included: (singleton(C) | singleton(D) | singleton(E) klass) -> (Array[singleton(C) | singleton(D) | singleton(E)])
+end
+
+class C
+  include Foo
+end
+
+class D
+  include Foo
+end
+
+class E
+  include Foo
+end

data/smoke/inherited.rb

@@ -0,0 +1,26 @@
+class Foo
+  @inherited = []
+  def self.inherited(klass)
+    @inherited << klass
+  end
+end
+
+class Bar < Foo
+end
+
+class Baz < Foo
+end
+
+__END__
+# Classes
+class Foo
+  self.@inherited: Array[singleton(Bar) | singleton(Baz)]
+
+  def self.inherited: (singleton(Bar) | singleton(Baz) klass) -> (Array[singleton(Bar) | singleton(Baz)])
+end
+
+class Bar < Foo
+end
+
+class Baz < Foo
+end

data/smoke/instance_eval.rb

@@ -13,6 +13,6 @@ end
 __END__
 # Classes
 class C
-  def self.foo: { (C) -> nil } -> C
+  def self.foo: { (C) -> nil } -> nil
   def log: (Integer n) -> nil
 end

data/smoke/instance_eval4.rb

@@ -0,0 +1,12 @@
+def foo
+  5.instance_eval { i }
+end
+
+foo
+
+__END__
+# Classes
+class Object
+  private
+  def foo: -> Complex
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: typeprof
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.13.0
 platform: ruby
 authors:
 - Yusuke Endoh
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-01-29 00:00:00.000000000 Z
+date: 2021-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rbs
@@ -145,6 +145,7 @@ files:
 - smoke/class-hierarchy2.rb
 - smoke/class-new.rb
 - smoke/class.rb
+- smoke/class_eval.rb
 - smoke/class_instance_var.rb
 - smoke/class_method.rb
 - smoke/class_method2.rb
@@ -164,6 +165,7 @@ files:
 - smoke/define_method4.rbs
 - smoke/define_method5.rb
 - smoke/define_method6.rb
+- smoke/define_method7.rb
 - smoke/demo.rb
 - smoke/demo1.rb
 - smoke/demo10.rb
@@ -185,6 +187,7 @@ files:
 - smoke/enumerator.rb
 - smoke/expandarray1.rb
 - smoke/expandarray2.rb
+- smoke/extended.rb
 - smoke/fib.rb
 - smoke/flip-flop.rb
 - smoke/flow1.rb
@@ -211,12 +214,15 @@ files:
 - smoke/hash3.rb
 - smoke/hash4.rb
 - smoke/hash5.rb
+- smoke/included.rb
 - smoke/inheritance.rb
 - smoke/inheritance2.rb
+- smoke/inherited.rb
 - smoke/initialize.rb
 - smoke/instance_eval.rb
 - smoke/instance_eval2.rb
 - smoke/instance_eval3.rb
+- smoke/instance_eval4.rb
 - smoke/int_times.rb
 - smoke/integer.rb
 - smoke/ivar.rb