typeprof 0.1.4 → 0.2.0

data/lib/typeprof/iseq.rb

@@ -125,7 +125,7 @@ module TypeProf
       "#{ @path }:#{ @linenos[pc] }"
     end
 
-    attr_reader :name, :path, :abolute_path, :start_lineno, :type, :locals, :fargs_format, :catch_table, :insns, :linenos
+    attr_reader :name, :path, :absolute_path, :start_lineno, :type, :locals, :fargs_format, :catch_table, :insns, :linenos
     attr_reader :id
 
     def pretty_print(q)

data/lib/typeprof/method.rb

@@ -38,7 +38,7 @@ module TypeProf
 
       # XXX: need to check .rbs fargs and .rb fargs
 
-      ctx = Context.new(@iseq, @cref, mid) # XXX: to support opts, rest, etc
+      ctx = Context.new(@iseq, @cref, mid)
       callee_ep = ExecutionPoint.new(ctx, start_pc, nil)
 
       locals = [Type.nil] * @iseq.locals.size
@@ -110,12 +110,13 @@ module TypeProf
   end
 
   class AttrMethodDef < MethodDef
-    def initialize(ivar, kind)
+    def initialize(ivar, kind, absolute_path)
       @ivar = ivar
       @kind = kind # :reader | :writer
+      @absolute_path = absolute_path
     end
 
-    attr_reader :ivar, :kind
+    attr_reader :ivar, :kind, :absolute_path
 
     def do_send(recv, mid, aargs, caller_ep, caller_env, scratch, &ctn)
       case @kind
@@ -153,7 +154,6 @@ module TypeProf
       aargs = scratch.globalize_type(aargs, caller_env, caller_ep)
       @sigs.each do |fargs, ret_ty|
         ncaller_env = caller_env
-        # XXX: need to interpret args more correctly
         #pp [mid, aargs, fargs]
         # XXX: support self type in fargs
         subst = { Type::Var.new(:self) => recv }
@@ -187,46 +187,48 @@ module TypeProf
             scratch.add_callsite!(dummy_ctx, nil, caller_ep, ncaller_env, &ctn)
             nfargs = fargs.blk_ty.fargs
             alloc_site = AllocationSite.new(caller_ep).add_id(self)
-            nfargs = nfargs.map.with_index do |nfarg, i|
+            nlead_tys = (nfargs.lead_tys + nfargs.opt_tys).map.with_index do |ty, i|
               if recv.is_a?(Type::Array)
                 tyvar_elem = Type::Var.new(:Elem)
-                nfarg = nfarg.substitute(subst.merge({ tyvar_elem => recv.elems.squash }), Config.options[:type_depth_limit])
+                ty = ty.substitute(subst.merge({ tyvar_elem => recv.elems.squash }), Config.options[:type_depth_limit])
               else
-                nfarg = nfarg.substitute(subst, Config.options[:type_depth_limit])
+                ty = ty.substitute(subst, Config.options[:type_depth_limit])
               end
-              nfarg = nfarg.remove_type_vars
+              ty = ty.remove_type_vars
               alloc_site2 = alloc_site.add_id(i)
-              dummy_env, nfarg = scratch.localize_type(nfarg, dummy_env, dummy_ep, alloc_site2)
-              nfarg
+              dummy_env, ty = scratch.localize_type(ty, dummy_env, dummy_ep, alloc_site2)
+              ty
             end
-            naargs = ActualArguments.new(nfargs, nil, nil, Type.nil) # XXX: support block to block?
-            scratch.do_invoke_block(false, aargs.blk_ty, naargs, dummy_ep, dummy_env) do |blk_ret_ty, _ep, _env|
-              subst2 = {}
-              if blk_ret_ty.consistent?(fargs.blk_ty.ret_ty, subst2)
-                if recv.is_a?(Type::Array) && recv_orig.is_a?(Type::LocalArray)
-                  tyvar_elem = Type::Var.new(:Elem)
-                  if subst2[tyvar_elem]
-                    ncaller_env = scratch.update_container_elem_types(ncaller_env, caller_ep, recv_orig.id) do |elems|
-                      elems.update(nil, subst2[tyvar_elem])
+            0.upto(nfargs.opt_tys.size) do |n|
+              naargs = ActualArguments.new(nlead_tys[0, nfargs.lead_tys.size + n], nil, nil, Type.nil) # XXX: support block to block?
+              scratch.do_invoke_block(false, aargs.blk_ty, naargs, dummy_ep, dummy_env) do |blk_ret_ty, _ep, _env|
+                subst2 = {}
+                if blk_ret_ty.consistent?(fargs.blk_ty.ret_ty, subst2)
+                  if recv.is_a?(Type::Array) && recv_orig.is_a?(Type::LocalArray)
+                    tyvar_elem = Type::Var.new(:Elem)
+                    if subst2[tyvar_elem]
+                      ncaller_env = scratch.update_container_elem_types(ncaller_env, caller_ep, recv_orig.id) do |elems|
+                        elems.update(nil, subst2[tyvar_elem])
+                      end
+                      scratch.merge_return_env(caller_ep) {|env| env ? env.merge(ncaller_env) : ncaller_env }
                     end
-                    scratch.merge_return_env(caller_ep) {|env| env ? env.merge(ncaller_env) : ncaller_env }
+                    ret_ty = ret_ty.substitute(subst2, Config.options[:type_depth_limit])
+                  else
+                    ret_ty = ret_ty.substitute(subst2, Config.options[:type_depth_limit])
                   end
-                  ret_ty = ret_ty.substitute(subst2, Config.options[:type_depth_limit])
                 else
-                  ret_ty = ret_ty.substitute(subst2, Config.options[:type_depth_limit])
+                  # raise "???"
+                  # XXX: need warning
+                  ret_ty = Type.any
                 end
-              else
-                # raise "???"
-                # XXX: need warning
-                ret_ty = Type.any
+                ret_ty = ret_ty.remove_type_vars
+                # XXX: check the return type from the block
+                # sig.blk_ty.ret_ty.eql?(_ret_ty) ???
+                scratch.add_return_type!(dummy_ctx, ret_ty)
               end
-              ret_ty = ret_ty.remove_type_vars
-              # XXX: check the return type from the block
-              # sig.blk_ty.ret_ty.eql?(_ret_ty) ???
-              scratch.add_return_type!(dummy_ctx, ret_ty)
+              # scratch.add_return_type!(dummy_ctx, ret_ty) ?
+              # This makes `def foo; 1.times { return "str" }; end` return Integer|String
             end
-            # scratch.add_return_type!(dummy_ctx, ret_ty) ?
-            # This makes `def foo; 1.times { return "str" }; end` return Integer|String
           else
             # XXX: a block is passed to a method that does not accept block.
             # Should we call the passed block with any arguments?
@@ -259,7 +261,6 @@ module TypeProf
     end
 
     def do_send(recv, mid, aargs, caller_ep, caller_env, scratch, &ctn)
-      # XXX: ctn?
       scratch.merge_return_env(caller_ep) {|env| env ? env.merge(caller_env) : caller_env } # for Kernel#lambda
       @impl[recv, mid, aargs, caller_ep, caller_env, scratch, &ctn]
     end

data/lib/typeprof/type.rb

@@ -533,8 +533,6 @@ module TypeProf
 
     class TypedProc < Type
       def initialize(fargs, ret_ty, type)
-        # XXX: need to receive blk_ty?
-        # XXX: may refactor "arguments = arg_tys * blk_ty" out
         @fargs = fargs
         @ret_ty = ret_ty
         @type = type
@@ -639,10 +637,9 @@ module TypeProf
       end
     end
 
-    def self.gen_hash
+    def self.gen_hash(base_ty = Type::Instance.new(Type::Builtin[:hash]))
       hg = HashGenerator.new
       yield hg
-      base_ty = Type::Instance.new(Type::Builtin[:hash])
       Type::Hash.new(Type::Hash::Elements.new(hg.map_tys), base_ty)
     end
 

data/run.sh

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-bundle exe ruby exe/type-profiler $@
+bundle exe ruby exe/typeprof $@

data/smoke/block13.rb

@@ -0,0 +1,9 @@
+foo do |n|
+  p n
+end
+
+__END__
+# Revealed types
+#  smoke/block13.rb:2 #=> Integer?
+
+# Classes

data/smoke/block13.rbs

@@ -0,0 +1,3 @@
+class Object
+  def foo : { (?Integer) -> String } -> String
+end

data/smoke/class.rb

@@ -3,3 +3,5 @@ class Foo
 end
 __END__
 # Classes
+class Foo
+end

data/smoke/constant1.rb

@@ -30,6 +30,9 @@ Foo::Bar.new.get4 # Integer
 
 __END__
 # Classes
+class Foo
+end
+
 class Foo::Bar
   def get1 : -> String
   def get2 : -> Integer

data/smoke/demo5.rb

@@ -11,3 +11,6 @@ __END__
 class A
   def self.foo : (Integer | Integer.class) -> String
 end
+
+class B < A
+end

data/smoke/gvar.rb

@@ -5,7 +5,7 @@ log($foo)
 
 __END__
 # Global variables
-#  $foo : Integer | String
+$foo : Integer | String
 
 # Classes
 class Object

data/smoke/gvar2.rb

@@ -0,0 +1,17 @@
+$foo = 1
+
+def log
+  $foo
+end
+
+__END__
+# Errors
+smoke/gvar2.rb:1: [warning] inconsistent assignment to RBS-declared global variable
+
+# Global variables
+#$foo : String
+
+# Classes
+class Object
+  def log : -> String
+end

data/smoke/gvar2.rbs

@@ -0,0 +1 @@
+$foo : String

data/smoke/inheritance2.rb

@@ -27,3 +27,9 @@ end
 class Base < SuperBase
   def self.foo : -> (A.class | B.class)
 end
+
+class A < Base
+end
+
+class B < Base
+end

data/smoke/ivar3.rb

@@ -0,0 +1,16 @@
+class Foo
+  def initialize
+    @foo = "str"
+    @bar = "str"
+  end
+end
+
+__END__
+# Errors
+smoke/ivar3.rb:3: [warning] inconsistent assignment to RBS-declared global variable
+
+# Classes
+class Foo
+  @bar : String
+  def initialize : -> String
+end

data/smoke/ivar3.rbs

@@ -0,0 +1,3 @@
+class Foo
+  @foo : Integer
+end

data/smoke/manual-rbs2.rb

@@ -12,7 +12,7 @@ end
 
 __END__
 # Errors
-smoke/manual-rbs2.rb:4: [error] undefined method: A::B.class#unknown
+smoke/manual-rbs2.rb:4: [error] undefined method: A::B#unknown
 
 # Classes
 class Object

data/smoke/manual-rbs3.rb

@@ -0,0 +1,12 @@
+class Foo
+  def foo
+    @foo = 1
+  end
+end
+
+__END__
+# Classes
+class Foo
+  @foo : Integer
+# def foo : -> Integer
+end

data/smoke/manual-rbs3.rbs

@@ -0,0 +1,3 @@
+class Foo
+  def foo: -> Integer
+end

data/smoke/module4.rb

@@ -27,3 +27,6 @@ end
 module M1
   def foo : -> :m1_foo
 end
+
+class C
+end

data/smoke/multiple-superclass.rb

@@ -14,3 +14,11 @@ __END__
 smoke/multiple-superclass.rb:9: [warning] superclass is not a class; Object is used instead
 
 # Classes
+class A
+end
+
+class B
+end
+
+class C
+end

data/smoke/rbs-alias.rb

@@ -0,0 +1,9 @@
+def log
+  Foo.new.bar
+end
+
+__END__
+# Classes
+class Object
+  def log : -> Integer
+end

data/smoke/rbs-alias.rbs

@@ -0,0 +1,4 @@
+class Foo
+  def foo: -> Integer
+  alias bar foo
+end

data/smoke/rbs-attr.rb

@@ -0,0 +1,26 @@
+def read_test_1
+  Foo.new.reader_example
+end
+
+def read_test_2
+  Foo.new.accessor_example
+end
+
+def write_test
+  Foo.new.writer_example = 1
+  Foo.new.writer_example = "str"
+  Foo.new.accessor_example = 1
+  Foo.new.accessor_example = "str"
+end
+
+__END__
+# Errors
+smoke/rbs-attr.rb:11: [error] failed to resolve overload: Foo#writer_example=
+smoke/rbs-attr.rb:13: [error] failed to resolve overload: Foo#accessor_example=
+
+# Classes
+class Object
+  def read_test_1 : -> Integer
+  def read_test_2 : -> Integer
+  def write_test : -> String
+end

data/smoke/rbs-attr.rbs

@@ -0,0 +1,5 @@
+class Foo
+  attr_reader reader_example: Integer
+  attr_writer writer_example: Integer
+  attr_accessor accessor_example: Integer
+end

data/smoke/rbs-vars.rb

@@ -0,0 +1,39 @@
+def gvar_test
+  $gvar
+end
+
+class Foo
+  def const_test
+    CONST
+  end
+
+  def ivar_test
+    @ivar
+  end
+
+  def cvar_test
+    @@cvar
+  end
+
+  def self.cvar_test2
+    @@cvar
+  end
+end
+
+__END__
+# Global variables
+#$gvar : :gvar_example
+
+# Classes
+class Object
+  def gvar_test : -> :gvar_example
+end
+
+class Foo
+# @ivar : :ivar_example
+# @@cvar : :cvar_example
+  def const_test : -> :const_example
+  def ivar_test : -> :ivar_example
+  def cvar_test : -> :cvar_example
+  def self.cvar_test2 : -> :cvar_example
+end

data/smoke/rbs-vars.rbs

@@ -0,0 +1,7 @@
+$gvar: :gvar_example
+
+class Foo
+  CONST: :const_example
+  @ivar: :ivar_example
+  @@cvar: :cvar_example
+end

data/smoke/struct.rb

@@ -7,3 +7,6 @@ __END__
 class (Struct) < Struct
   attr_accessor a() : untyped
 end
+
+class Foo < (Struct)
+end

data/smoke/super1.rb

@@ -37,6 +37,24 @@ class Object
   def log : (Baz) -> nil
 end
 
+class A
+end
+
+class B
+end
+
+class C
+end
+
+class X
+end
+
+class Y
+end
+
+class Z
+end
+
 class Foo
   def f : (C) -> X
 end

data/smoke/union-recv.rb

@@ -27,3 +27,9 @@ end
 class Base < SuperBase
   def self.foo : -> (A.class | B.class)
 end
+
+class A < Base
+end
+
+class B < Base
+end