typeprof 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e8ecd99e5448a244b11714710dfbb5fd3f36274c5f72fa97da034059018fc32f
-  data.tar.gz: ed322065cf15d08f7bb50105cce19d74d923d4d7af7f94a563668788849d636d
+  metadata.gz: dd38b5e501a5d4fbe4db1ad43015c44ab39dbfefc3f7638516faeb5bcafd21a9
+  data.tar.gz: 000f140ab750e4ddd57863851c21a830bfe470c0eb7be9e38442ca535f4ef041
 SHA512:
-  metadata.gz: 528dcf83aa2ceec79ea602f3505eb48230baf87bae8409212f8f152b45e308c66490ff5d10a9153698870e02b0ee5f031ce81cbb48a4460187992269708957ef
-  data.tar.gz: a03594cb0b6a88ba905dc860ba9de64beb82a6cb1ebc562aad94cf20ecf14e36534bbf8a29a0b629189c62c32c26437104acb4387159c17bb222c708614cc303
+  metadata.gz: '00924963d5f91c4609224615507fcfb240a140c8119bf76f24aa28973342e6b61c528fc579781690f9f0392bf0d125c8bdb70499525791603c111ed9251da931'
+  data.tar.gz: ee07e0636cd3e26271c468e1927e676a1b320ddefe13dc2412c254cac9aaeac7ca5db1936a26ccc477c2494473fde1d2bdde7a28bd1fa384c6995d7ae4d085ea

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    typeprof (0.7.0)
+    typeprof (0.8.0)
       rbs (>= 0.17.0)
 
 GEM
@@ -11,11 +11,13 @@ GEM
     docile (1.3.2)
     power_assert (1.2.0)
     rake (13.0.1)
-    rbs (0.17.0)
-    simplecov (0.19.1)
+    rbs (0.18.1)
+    simplecov (0.20.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
+      simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
+    simplecov_json_formatter (0.1.2)
     stackprof (0.2.16)
     test-unit (3.3.7)
       power_assert

data/lib/typeprof/analyzer.rb

@@ -83,10 +83,11 @@ module TypeProf
   class StaticEnv
     include Utils::StructuralEquality
 
-    def initialize(recv_ty, blk_ty, mod_func)
+    def initialize(recv_ty, blk_ty, mod_func, pub_meth)
       @recv_ty = recv_ty
       @blk_ty = blk_ty
       @mod_func = mod_func
+      @pub_meth = pub_meth
 
       return if recv_ty == :top #OK
       recv_ty.each_child_global do |ty|
@@ -94,13 +95,14 @@ module TypeProf
       end
     end
 
-    attr_reader :recv_ty, :blk_ty, :mod_func
+    attr_reader :recv_ty, :blk_ty, :mod_func, :pub_meth
 
     def merge(other)
       recv_ty = @recv_ty.union(other.recv_ty)
       blk_ty = @blk_ty.union(other.blk_ty)
       mod_func = @mod_func & other.mod_func # ??
-      StaticEnv.new(recv_ty, blk_ty, mod_func)
+      pub_meth = @pub_meth & other.pub_meth # ??
+      StaticEnv.new(recv_ty, blk_ty, mod_func, pub_meth)
     end
   end
 
@@ -195,12 +197,17 @@ module TypeProf
     end
 
     def enable_module_function
-      senv = StaticEnv.new(@static_env.recv_ty, @static_env.blk_ty, true)
+      senv = StaticEnv.new(@static_env.recv_ty, @static_env.blk_ty, true, @static_env.pub_meth)
+      Env.new(senv, @locals, @stack, @type_params)
+    end
+
+    def method_public_set(flag)
+      senv = StaticEnv.new(@static_env.recv_ty, @static_env.blk_ty, @static_env.mod_func, flag)
       Env.new(senv, @locals, @stack, @type_params)
     end
 
     def replace_recv_ty(ty)
-      senv = StaticEnv.new(ty, @static_env.blk_ty, @static_env.mod_func)
+      senv = StaticEnv.new(ty, @static_env.blk_ty, @static_env.mod_func, @static_env.pub_meth)
       Env.new(senv, @locals, @stack, @type_params)
     end
 
@@ -380,12 +387,12 @@ module TypeProf
       cbase && cbase.idx != 1 ? @class_defs[cbase.idx].name : []
     end
 
-    def new_class(cbase, name, type_params, superclass, superclass_type_args, absolute_path)
+    def new_class(cbase, name, type_params, superclass, absolute_path)
       show_name = cbase_path(cbase) + [name]
       idx = @class_defs.size
       if superclass
         @class_defs[idx] = ClassDef.new(:class, show_name, absolute_path)
-        klass = Type::Class.new(:class, idx, type_params, superclass, superclass_type_args, show_name)
+        klass = Type::Class.new(:class, idx, type_params, superclass, show_name)
         @class_defs[idx].klass_obj = klass
         cbase ||= klass # for bootstrap
         add_constant(cbase, name, klass, absolute_path)
@@ -393,13 +400,17 @@ module TypeProf
       else
         # module
         @class_defs[idx] = ClassDef.new(:module, show_name, absolute_path)
-        mod = Type::Class.new(:module, idx, type_params, nil, nil, show_name)
+        mod = Type::Class.new(:module, idx, type_params, nil, show_name)
         @class_defs[idx].klass_obj = mod
         add_constant(cbase, name, mod, absolute_path)
         return mod
       end
     end
 
+    def add_superclass_type_args!(klass, tyargs)
+      klass.superclass_type_args = tyargs
+    end
+
     def new_struct(ep)
       return @struct_defs[ep] if @struct_defs[ep]
 
@@ -407,7 +418,8 @@ module TypeProf
       superclass = Type::Builtin[:struct]
       name = "AnonymousStruct_generated_#{ @anonymous_struct_gen_id += 1 }"
       @class_defs[idx] = ClassDef.new(:class, [name], ep.ctx.iseq.absolute_path)
-      klass = Type::Class.new(:class, idx, [], superclass, [Type.any], name)
+      klass = Type::Class.new(:class, idx, [], superclass, name)
+      add_superclass_type_args!(klass, [Type.any])
       @class_defs[idx].klass_obj = klass
 
       @struct_defs[ep] = klass
@@ -563,12 +575,12 @@ module TypeProf
       end
     end
 
-    def add_iseq_method(klass, mid, iseq, cref, outer_ep)
-      add_method(klass, mid, false, ISeqMethodDef.new(iseq, cref, outer_ep))
+    def add_iseq_method(klass, mid, iseq, cref, outer_ep, pub_meth)
+      add_method(klass, mid, false, ISeqMethodDef.new(iseq, cref, outer_ep, pub_meth))
     end
 
-    def add_singleton_iseq_method(klass, mid, iseq, cref, outer_ep)
-      add_method(klass, mid, true, ISeqMethodDef.new(iseq, cref, outer_ep))
+    def add_singleton_iseq_method(klass, mid, iseq, cref, outer_ep, pub_meth)
+      add_method(klass, mid, true, ISeqMethodDef.new(iseq, cref, outer_ep, pub_meth))
     end
 
     def set_custom_method(klass, mid, impl)
@@ -953,7 +965,7 @@ module TypeProf
       locals[kwrest_index] = Type.any if kwrest_index
       locals[block_index] = Type.nil if block_index
 
-      env = Env.new(StaticEnv.new(recv, Type.nil, false), locals, [], Utils::HashWrapper.new({}))
+      env = Env.new(StaticEnv.new(recv, Type.nil, false, true), locals, [], Utils::HashWrapper.new({}))
 
       if !@pending_execution[iseq] || @pending_execution[iseq][0] == :block
         @pending_execution[iseq] = [:method, [meth, ep, env]]
@@ -1148,7 +1160,7 @@ module TypeProf
         cref = ep.ctx.cref
         recv.each_child do |recv|
           if recv.is_a?(Type::Class)
-            meth = add_singleton_iseq_method(recv, mid, iseq, cref, nil)
+            meth = add_singleton_iseq_method(recv, mid, iseq, cref, nil, env.static_env.pub_meth)
             pend_method_execution(iseq, meth, recv, mid, ep.ctx.cref, nil)
           else
             recv = Type.any # XXX: what to do?
@@ -1188,8 +1200,8 @@ module TypeProf
             if cbase == Type.any
               klass = Type.any
             else
-              superclass_type_args = superclass.type_params.map { Type.any } if superclass
-              klass = new_class(cbase, id, [], superclass, superclass_type_args, ep.ctx.iseq.absolute_path)
+              klass = new_class(cbase, id, [], superclass, ep.ctx.iseq.absolute_path)
+              add_superclass_type_args!(klass, superclass.type_params.map { Type.any }) if superclass
             end
           end
           singleton = false
@@ -1211,7 +1223,7 @@ module TypeProf
         nctx = Context.new(iseq, ncref, nil)
         nep = ExecutionPoint.new(nctx, 0, nil)
         locals = [Type.nil] * iseq.locals.size
-        nenv = Env.new(StaticEnv.new(recv, blk, false), locals, [], Utils::HashWrapper.new({}))
+        nenv = Env.new(StaticEnv.new(recv, blk, false, true), locals, [], Utils::HashWrapper.new({}))
         merge_env(nep, nenv)
         add_callsite!(nep.ctx, ep, env) do |ret_ty, ep, env|
           nenv, ret_ty = localize_type(ret_ty, env, ep)
@@ -1940,7 +1952,7 @@ module TypeProf
         nctx = Context.new(blk_iseq, ep.ctx.cref, ep.ctx.mid)
         nep = ExecutionPoint.new(nctx, 0, ep)
         nlocals = [Type.any] * blk_iseq.locals.size
-        nsenv = StaticEnv.new(env.static_env.recv_ty, Type.any, env.static_env.mod_func)
+        nsenv = StaticEnv.new(env.static_env.recv_ty, Type.any, env.static_env.mod_func, env.static_env.pub_meth)
         nenv = Env.new(nsenv, nlocals, [], nil)
         pend_block_dummy_execution(blk_ty, blk_iseq, nep, nenv)
         merge_return_env(ep) {|tenv| tenv ? tenv.merge(env) : env }
@@ -1996,17 +2008,17 @@ module TypeProf
         typed_mdef = check_typed_method(cref.klass, mid, ep.ctx.cref.singleton)
         recv = Type::Instance.new(recv) if recv.is_a?(Type::Class)
         if typed_mdef
-          mdef = ISeqMethodDef.new(iseq, cref, outer_ep)
+          mdef = ISeqMethodDef.new(iseq, cref, outer_ep, env.static_env.pub_meth)
           typed_mdef.each do |typed_mdef|
             typed_mdef.do_match_iseq_mdef(mdef, recv, mid, env, ep, self)
           end
         else
           if ep.ctx.cref.singleton
-            meth = add_singleton_iseq_method(cref.klass, mid, iseq, cref, outer_ep)
+            meth = add_singleton_iseq_method(cref.klass, mid, iseq, cref, outer_ep, true)
           else
-            meth = add_iseq_method(cref.klass, mid, iseq, cref, outer_ep)
+            meth = add_iseq_method(cref.klass, mid, iseq, cref, outer_ep, env.static_env.pub_meth)
             if env.static_env.mod_func
-              add_singleton_iseq_method(cref.klass, mid, iseq, cref, outer_ep)
+              add_singleton_iseq_method(cref.klass, mid, iseq, cref, outer_ep, true)
             end
           end
 

data/lib/typeprof/builtin.rb

@@ -198,6 +198,38 @@ module TypeProf
       end
     end
 
+    def module_public(recv, mid, aargs, ep, env, scratch, &ctn)
+      if aargs.lead_tys.empty?
+        ctn[recv, ep, env.method_public_set(true)]
+      else
+        aargs.lead_tys.each do |aarg|
+          sym = get_sym("public", aarg, ep, scratch) or next
+          meths = scratch.get_method(recv, false, sym)
+          next unless meths
+          meths.each do |mdef|
+            mdef.pub_meth = true
+          end
+        end
+        ctn[recv, ep, env]
+      end
+    end
+
+    def module_private(recv, mid, aargs, ep, env, scratch, &ctn)
+      if aargs.lead_tys.empty?
+        ctn[recv, ep, env.method_public_set(false)]
+      else
+        aargs.lead_tys.each do |aarg|
+          sym = get_sym("private", aarg, ep, scratch) or next
+          meths = scratch.get_method(recv, false, sym)
+          next unless meths
+          meths.each do |mdef|
+            mdef.pub_meth = false
+          end
+        end
+        ctn[recv, ep, env]
+      end
+    end
+
     def module_define_method(recv, mid, aargs, ep, env, scratch, &ctn)
       if aargs.lead_tys.size != 1
         scratch.warn(ep, "Module#define with #{ aargs.lead_tys.size } argument is ignored")
@@ -551,8 +583,8 @@ module TypeProf
     end
 
     def self.setup_initial_global_env(scratch)
-      klass_basic_obj = scratch.new_class(nil, :BasicObject, [], :__root__, nil, nil) # cbase, name, superclass
-      klass_obj = scratch.new_class(nil, :Object, [], klass_basic_obj, [], nil)
+      klass_basic_obj = scratch.new_class(nil, :BasicObject, [], :__root__, nil) # cbase, name, superclass
+      klass_obj = scratch.new_class(nil, :Object, [], klass_basic_obj, nil)
       scratch.add_constant(klass_obj, :Object, klass_obj, nil)
       scratch.add_constant(klass_obj, :BasicObject, klass_basic_obj, nil)
 
@@ -561,7 +593,7 @@ module TypeProf
 
       Import.import_builtin(scratch)
 
-      Type::Builtin[:vmcore]    = scratch.new_class(klass_obj, :VMCore, [], klass_obj, [], nil)
+      Type::Builtin[:vmcore]    = scratch.new_class(klass_obj, :VMCore, [], klass_obj, nil)
       Type::Builtin[:int]       = scratch.get_constant(klass_obj, :Integer)
       Type::Builtin[:float]     = scratch.get_constant(klass_obj, :Float)
       Type::Builtin[:rational]  = scratch.get_constant(klass_obj, :Rational)
@@ -606,6 +638,8 @@ module TypeProf
       scratch.set_custom_method(klass_module, :include, Builtin.method(:module_include))
       scratch.set_custom_method(klass_module, :extend, Builtin.method(:module_extend))
       scratch.set_custom_method(klass_module, :module_function, Builtin.method(:module_module_function))
+      scratch.set_custom_method(klass_module, :public, Builtin.method(:module_public))
+      scratch.set_custom_method(klass_module, :private, Builtin.method(:module_private))
       scratch.set_custom_method(klass_module, :define_method, Builtin.method(:module_define_method))
 
       scratch.set_custom_method(klass_proc, :[], Builtin.method(:proc_call))

data/lib/typeprof/config.rb

@@ -69,7 +69,7 @@ module TypeProf
 
     prologue_ctx = Context.new(nil, nil, nil)
     prologue_ep = ExecutionPoint.new(prologue_ctx, -1, nil)
-    prologue_env = Env.new(StaticEnv.new(:top, Type.nil, false), [], [], Utils::HashWrapper.new({}))
+    prologue_env = Env.new(StaticEnv.new(:top, Type.nil, false, true), [], [], Utils::HashWrapper.new({}))
 
     Config.rb_files.each do |rb|
       if rb.is_a?(Array) # [String name, String content]
@@ -113,7 +113,7 @@ module TypeProf
     ctx = Context.new(iseq, cref, nil)
     ep = ExecutionPoint.new(ctx, 0, nil)
     locals = [Type.nil] * iseq.locals.size
-    env = Env.new(StaticEnv.new(recv, Type.nil, false), locals, [], Utils::HashWrapper.new({}))
+    env = Env.new(StaticEnv.new(recv, Type.nil, false, false), locals, [], Utils::HashWrapper.new({}))
 
     return ep, env
   end

data/lib/typeprof/export.rb

@@ -135,8 +135,9 @@ module TypeProf
               method_name = ctx.mid
               method_name = "self.#{ method_name }" if singleton
 
-              iseq_methods[method_name] ||= []
-              iseq_methods[method_name] << @scratch.show_method_signature(ctx)
+              iseq_methods[method_name] ||= [true, []]
+              iseq_methods[method_name][0] &&= mdef.pub_meth
+              iseq_methods[method_name][1] << @scratch.show_method_signature(ctx)
             end
           when AttrMethodDef
             next if !mdef.absolute_path || Config.check_dir_filter(mdef.absolute_path) == :exclude
@@ -296,8 +297,13 @@ module TypeProf
         output.puts indent + "# def #{ method_name } : #{ sigs }"
         first = false
       end
-      class_data.iseq_methods.each do |method_name, sigs|
+      prev_pub_meth = true
+      class_data.iseq_methods.each do |method_name, (pub_meth, sigs)|
         sigs = sigs.sort.join("\n" + indent + " " * (method_name.size + 7) + "| ")
+        if prev_pub_meth != pub_meth
+          output.puts indent + "  #{ pub_meth ? "public" : "private" }"
+          prev_pub_meth = pub_meth
+        end
         output.puts indent + "  def #{ method_name } : #{ sigs }"
         first = false
       end

data/lib/typeprof/import.rb

@@ -62,7 +62,6 @@ module TypeProf
   class RBS2JSON
     def initialize(all_env, cur_env)
       @all_env, @cur_env = all_env, cur_env
-      @env_walker = RBS::EnvironmentWalker.new(env: @cur_env) # Currently, only each_type_name is used
     end
 
     def dump_json
@@ -259,12 +258,6 @@ module TypeProf
       yield decl.name
       if decl.super_class
         name = decl.super_class.name
-        args = decl.super_class.args
-        if args
-          args.each do |ty|
-            @env_walker.each_type_name(ty, &blk)
-          end
-        end
       else
         name = RBS::BuiltinNames::Object.name
       end
@@ -476,8 +469,7 @@ module TypeProf
 
         klass = @scratch.get_constant(base_klass, name)
         if klass.is_a?(Type::Any)
-          superclass_type_args = superclass_type_args&.map {|ty| conv_type(ty) }
-          klass = @scratch.new_class(base_klass, name, type_params, superclass, superclass_type_args, nil)
+          klass = @scratch.new_class(base_klass, name, type_params, superclass, nil)
 
           # There builtin classes are needed to interpret RBS declarations
           case classpath
@@ -493,10 +485,11 @@ module TypeProf
           end
         end
 
-        [klass, members]
+        [klass, superclass_type_args, members]
       end
 
-      classes.each do |klass, members|
+      classes.each do |klass, superclass_type_args, members|
+        @scratch.add_superclass_type_args!(klass, superclass_type_args&.map {|ty| conv_type(ty) })
         included_modules = members[:included_modules]
         extended_modules = members[:extended_modules]
         methods = members[:methods]

data/lib/typeprof/method.rb

@@ -4,13 +4,16 @@ module TypeProf
   end
 
   class ISeqMethodDef < MethodDef
-    def initialize(iseq, cref, outer_ep)
+    def initialize(iseq, cref, outer_ep, pub_meth)
       @iseq = iseq
       raise if iseq.nil?
       @cref = cref
       @outer_ep = outer_ep
+      @pub_meth = pub_meth
     end
 
+    attr_accessor :pub_meth
+
     def do_send(recv, mid, aargs, caller_ep, caller_env, scratch, &ctn)
       recv = recv.base_type while recv.respond_to?(:base_type)
       recv = scratch.globalize_type(recv, caller_env, caller_ep)
@@ -27,7 +30,7 @@ module TypeProf
 
       nctx = Context.new(@iseq, @cref, mid)
       callee_ep = ExecutionPoint.new(nctx, 0, @outer_ep)
-      nenv = Env.new(StaticEnv.new(recv, blk_ty, false), locals, [], Utils::HashWrapper.new({}))
+      nenv = Env.new(StaticEnv.new(recv, blk_ty, false, true), locals, [], Utils::HashWrapper.new({}))
       alloc_site = AllocationSite.new(callee_ep)
       locals.each_with_index do |ty, i|
         alloc_site2 = alloc_site.add_id(i)
@@ -87,7 +90,7 @@ module TypeProf
       callee_ep = ExecutionPoint.new(ctx, 0, nil)
 
       locals = [Type.nil] * @iseq.locals.size
-      nenv = Env.new(StaticEnv.new(recv, msig.blk_ty, false), locals, [], Utils::HashWrapper.new({}))
+      nenv = Env.new(StaticEnv.new(recv, msig.blk_ty, false, true), locals, [], Utils::HashWrapper.new({}))
       alloc_site = AllocationSite.new(callee_ep)
       idx = 0
       msig.lead_tys.each_with_index do |ty, i|
@@ -224,7 +227,7 @@ module TypeProf
           dummy_ep = ExecutionPoint.new(dummy_ctx, -1, caller_ep)
           s_recv = recv
           s_recv = s_recv.base_type while s_recv.respond_to?(:base_type)
-          dummy_env = Env.new(StaticEnv.new(s_recv, msig.blk_ty, false), [], [], Utils::HashWrapper.new({}))
+          dummy_env = Env.new(StaticEnv.new(s_recv, msig.blk_ty, false, true), [], [], Utils::HashWrapper.new({}))
           if msig.blk_ty.is_a?(Type::Proc)
             scratch.add_callsite!(dummy_ctx, caller_ep, ncaller_env, &ctn)
             bsig = msig.blk_ty.block_body.msig

data/lib/typeprof/type.rb

@@ -435,17 +435,17 @@ module TypeProf
     end
 
     class Class < Type # or Module
-      def initialize(kind, idx, type_params, superclass, superclass_type_args, name)
+      def initialize(kind, idx, type_params, superclass, name)
         @kind = kind # :class | :module
         @idx = idx
         @type_params = type_params
         @superclass = superclass
         raise if @kind == :class && !@superclass
-        @superclass_type_args = superclass_type_args
         @_name = name
       end
 
-      attr_reader :kind, :idx, :type_params, :superclass, :superclass_type_args
+      attr_reader :kind, :idx, :type_params, :superclass
+      attr_accessor :superclass_type_args
 
       def inspect
         if @_name

data/lib/typeprof/version.rb

@@ -1,3 +1,3 @@
 module TypeProf
-  VERSION = "0.7.0"
+  VERSION = "0.8.0"
 end

data/smoke/alias.rb

@@ -20,6 +20,7 @@ Test.new.qux("str")
 __END__
 # Classes
 class Object
+  private
   def foo : (Integer) -> Integer
   def bar : (String) -> String
 end