typeprof 0.5.3 → 0.8.0

data/lib/typeprof/type.rb

@@ -149,6 +149,10 @@ module TypeProf
       raise "cannot substitute abstract type: #{ self.class }"
     end
 
+    def generate_substitution
+      {}
+    end
+
     DummySubstitution = Object.new
     def DummySubstitution.[](_)
       Type.any
@@ -170,7 +174,7 @@ module TypeProf
         "untyped"
       end
 
-      def get_method(mid, scratch)
+      def method_dispatch_info
         nil
       end
 
@@ -203,11 +207,12 @@ module TypeProf
         local = nil
         tys.each do |ty|
           raise ty.inspect unless ty.is_a?(Type)
-          local = true if ty.is_a?(LocalArray) || ty.is_a?(LocalHash)
+          local = true if ty.is_a?(Local)
         end
         raise if local && elems
 
         @elems = elems
+        raise elems.inspect if elems && !elems.is_a?(::Hash)
       end
 
       def each_free_type_variable(&blk)
@@ -285,7 +290,7 @@ module TypeProf
             types.delete(Type::Instance.new(Type::Builtin[:true]))
             bool = true
           end
-          types.delete(Type.any) unless Config.options[:pedantic_output]
+          types.delete(Type.any) unless Config.options[:show_untyped]
           proc_tys, types = types.partition {|ty| ty.is_a?(Proc) }
           types = types.map {|ty| ty.screen_name(scratch) }
           types << scratch.show_proc_signature(proc_tys) unless proc_tys.empty?
@@ -435,10 +440,12 @@ module TypeProf
         @idx = idx
         @type_params = type_params
         @superclass = superclass
+        raise if @kind == :class && !@superclass
         @_name = name
       end
 
       attr_reader :kind, :idx, :type_params, :superclass
+      attr_accessor :superclass_type_args
 
       def inspect
         if @_name
@@ -449,11 +456,11 @@ module TypeProf
       end
 
       def screen_name(scratch)
-        "#{ scratch.get_class_name(self) }.class"
+        "singleton(#{ scratch.get_class_name(self) })"
       end
 
-      def get_method(mid, scratch)
-        scratch.get_method(self, true, mid)
+      def method_dispatch_info
+        [self, true]
       end
 
       def consistent?(other)
@@ -504,8 +511,8 @@ module TypeProf
         end
       end
 
-      def get_method(mid, scratch)
-        scratch.get_method(@klass, false, mid)
+      def method_dispatch_info
+        [@klass, false]
       end
 
       def consistent?(other)
@@ -558,8 +565,8 @@ module TypeProf
         end
       end
 
-      def get_method(mid, scratch)
-        @base_type.get_method(mid, scratch)
+      def method_dispatch_info
+        @base_type.method_dispatch_info
       end
 
       def substitute(subst, depth)
@@ -600,8 +607,8 @@ module TypeProf
         end
       end
 
-      def get_method(mid, scratch)
-        @base_type.get_method(mid, scratch)
+      def method_dispatch_info
+        @base_type.method_dispatch_info
       end
 
       def substitute(_subst, _depth)
@@ -630,8 +637,8 @@ module TypeProf
         @base_type
       end
 
-      def get_method(mid, scratch)
-        @base_type.get_method(mid, scratch)
+      def method_dispatch_info
+        @base_type.method_dispatch_info
       end
 
       def consistent?(_other)
@@ -785,6 +792,10 @@ module TypeProf
       end
       str = str.empty? ? "" : "(#{ str.join(", ") })"
 
+      # Dirty Hack: Stop the iteration at most once!
+      # I'll remove this hack if RBS removes the limitation of nesting blocks
+      return str if caller_locations.any? {|frame| frame.label == "show_block_signature" }
+
       optional = false
       blks = []
       @blk_ty.each_child_global do |ty|
@@ -811,6 +822,7 @@ module TypeProf
       @opt_tys = opt_tys
       @rest_ty = rest_ty
       @post_tys = post_tys
+      raise unless post_tys
       @kw_tys = kw_tys
       kw_tys.each {|a| raise if a.size != 3 } if kw_tys
       @kw_rest_ty = kw_rest_ty

data/lib/typeprof/version.rb

@@ -1,3 +1,3 @@
 module TypeProf
-  VERSION = "0.5.3"
+  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

data/smoke/any1.rb

@@ -11,5 +11,6 @@ smoke/any1.rb:2: [error] undefined method: Integer#undefined_method
 
 # Classes
 class Object
+  private
   def foo : -> untyped
 end

data/smoke/any2.rb

@@ -12,6 +12,7 @@ bar
 __END__
 # Classes
 class Object
+  private
   def foo : -> untyped
   def bar : -> Integer
 end

data/smoke/arguments.rb

@@ -11,6 +11,7 @@ smoke/arguments.rb:6: [error] wrong number of arguments (given 2, expected 1)
 
 # Classes
 class Object
+  private
   def foo : (untyped) -> nil
   def bar : (untyped) -> nil
 end

data/smoke/arguments2.rb

@@ -42,6 +42,7 @@ f10 {|n| }
 __END__
 # Classes
 class Object
+  private
   def f1 : -> nil
   def f2 : (:x, :y, :z) -> nil
   def f3 : (?String, ?String) -> nil

data/smoke/array-each.rb

@@ -10,5 +10,6 @@ log(nil)
 __END__
 # Classes
 class Object
+  private
   def log : ((:sym | Integer | String)?) -> nil
 end

data/smoke/array-each2.rb

@@ -11,5 +11,6 @@ foo
 __END__
 # Classes
 class Object
+  private
   def foo : -> ((Integer | String)?)
 end

data/smoke/array-each3.rb

@@ -8,5 +8,6 @@ end
 __END__
 # Classes
 class Object
-  def log : (untyped) -> nil
+  private
+  def log : (bot) -> nil
 end

data/smoke/array-ltlt.rb

@@ -9,5 +9,6 @@ foo
 __END__
 # Classes
 class Object
+  private
   def foo : -> (Array[Integer | String])
 end

data/smoke/array-ltlt2.rb

@@ -12,5 +12,6 @@ foo
 __END__
 # Classes
 class Object
+  private
   def foo : -> (Array[Integer | String])
 end

data/smoke/array-map.rb

@@ -7,5 +7,6 @@ foo([1, 2, 3])
 __END__
 # Classes
 class Object
+  private
   def foo : ([Integer, Integer, Integer]) -> Array[String]
 end

data/smoke/array-map2.rb

@@ -6,5 +6,6 @@ foo([1, 2, 3])
 __END__
 # Classes
 class Object
+  private
   def foo : ([Integer, Integer, Integer]) -> (Array[Integer | String])
 end

data/smoke/array-map3.rb

@@ -16,6 +16,7 @@ map_bang_test_known_bug([1, 2, 3])
 __END__
 # Classes
 class Object
+  private
   def map_test : ([Integer, Integer, Integer]) -> Array[String]
   def map_bang_test : ([Integer, Integer, Integer]) -> (Array[Integer | String])
   def map_bang_test_known_bug : ([Integer, Integer, Integer]) -> [Integer, Integer, Integer]

data/smoke/array-mul.rb

@@ -12,6 +12,7 @@ bar([1, 2, 3])
 __END__
 # Classes
 class Object
+  private
   def foo : ([Integer, Integer, Integer]) -> Array[Integer]
   def bar : ([Integer, Integer, Integer]) -> String
 end

data/smoke/array-plus1.rb

@@ -6,5 +6,6 @@ log([1] + ["str"] + [2] + [:sym])
 __END__
 # Classes
 class Object
+  private
   def log : (Array[:sym | Integer | String]) -> nil
 end

data/smoke/array-pop.rb

@@ -7,5 +7,6 @@ foo
 __END__
 # Classes
 class Object
+  private
   def foo : -> (:sym | Integer | String)
 end

data/smoke/array-range-aref.rb

@@ -0,0 +1,71 @@
+def f1(*ary)
+  ary[1..3]
+end
+
+def f2(*ary)
+  ary[1...3]
+end
+
+def f3(*ary)
+  ary[1..-3]
+end
+
+def f4(*ary)
+  ary[1...-3]
+end
+
+def f5(*ary)
+  ary[-4..3]
+end
+
+def f6(*ary)
+  ary[-4...3]
+end
+
+def f7(*ary)
+  ary[-4..-3]
+end
+
+def f8(*ary)
+  ary[-4...-3]
+end
+
+def f9(*ary)
+  ary[...3]
+end
+
+def f10(*ary)
+  ary[3..]
+end
+
+def dispatch(*ary)
+  f1(*ary)
+  f2(*ary)
+  f3(*ary)
+  f4(*ary)
+  f5(*ary)
+  f6(*ary)
+  f7(*ary)
+  f8(*ary)
+  f9(*ary)
+  f10(*ary)
+end
+
+dispatch(:a, :b, :c, :d, :e)
+
+__END__
+# Classes
+class Object
+  private
+  def f1 : (*:a | :b | :c | :d | :e) -> (Array[:a | :b | :c | :d | :e])
+  def f2 : (*:a | :b | :c | :d | :e) -> (Array[:a | :b | :c | :d | :e])
+  def f3 : (*:a | :b | :c | :d | :e) -> (Array[:a | :b | :c | :d | :e])
+  def f4 : (*:a | :b | :c | :d | :e) -> (Array[:a | :b | :c | :d | :e])
+  def f5 : (*:a | :b | :c | :d | :e) -> (Array[:a | :b | :c | :d | :e])
+  def f6 : (*:a | :b | :c | :d | :e) -> (Array[:a | :b | :c | :d | :e])
+  def f7 : (*:a | :b | :c | :d | :e) -> (Array[:a | :b | :c | :d | :e])
+  def f8 : (*:a | :b | :c | :d | :e) -> (Array[:a | :b | :c | :d | :e])
+  def f9 : (*:a | :b | :c | :d | :e) -> (Array[:a | :b | :c | :d | :e])
+  def f10 : (*:a | :b | :c | :d | :e) -> (Array[:a | :b | :c | :d | :e])
+  def dispatch : (*:a | :b | :c | :d | :e) -> (Array[:a | :b | :c | :d | :e])
+end

data/smoke/array-replace.rb

@@ -8,5 +8,6 @@ foo([1, 2, 3])
 __END__
 # Classes
 class Object
+  private
   def foo : ([Integer, Integer, Integer]) -> (Array[Integer | String])
 end

data/smoke/array-s-aref.rb

@@ -7,5 +7,6 @@ foo
 __END__
 # Classes
 class Object
+  private
   def foo : -> (Array[Integer | String])
 end

data/smoke/array1.rb

@@ -18,6 +18,7 @@ quux(a[n])
 __END__
 # Classes
 class Object
+  private
   def foo : ([Integer, String]) -> Integer
   def bar : (Integer) -> nil
   def baz : (String) -> nil

data/smoke/array10.rb

@@ -10,5 +10,6 @@ foo([:a, :b, :c])
 __END__
 # Classes
 class Object
+  private
   def foo : ([:a, :b, :c]) -> :a
 end

data/smoke/array11.rb

@@ -9,5 +9,6 @@ array("foo")
 __END__
 # Classes
 class Object
-  def array : (Array[Integer] | String | {Integer=>Integer}) -> (Array[Integer | String | {Integer=>Integer}])
+  private
+  def array : (Array[Integer] | Hash[Integer, Integer] | String) -> (Array[Hash[Integer, Integer] | Integer | String])
 end

data/smoke/array12.rb

@@ -18,6 +18,7 @@ foo
 __END__
 # Classes
 class Object
+  private
   def bar : ([Integer]) -> nil
   def test_yield : { -> nil } -> nil
   def foo : -> [Integer]

data/smoke/array13.rb

@@ -23,6 +23,7 @@ end
 __END__
 # Classes
 class Object
+  private
   def tuple_set : -> [:a, :b, :z]
   def tuple_get : -> :c
   def seq_set : -> (Array[:a | :b | :c | :z])

data/smoke/array14.rb

@@ -9,5 +9,6 @@ f(:a, :b, :c)
 __END__
 # Classes
 class Object
+  private
   def f : (:a, :b, :c) -> :c
 end

data/smoke/array2.rb

@@ -21,6 +21,7 @@ log(a)
 __END__
 # Classes
 class Object
+  private
   def foo : -> [[String]]
   def bar : ([[Integer]]) -> [[String]]
   def log : ([[Integer]]) -> nil

data/smoke/array4.rb

@@ -10,5 +10,6 @@ foo
 __END__
 # Classes
 class Object
+  private
   def foo : -> [Integer]?
 end

data/smoke/array5.rb

@@ -9,5 +9,6 @@ foo
 __END__
 # Classes
 class Object
+  private
   def foo : -> [untyped]
 end

data/smoke/array6.rb

@@ -10,6 +10,7 @@ foo(1, "str")
 __END__
 # Classes
 class Object
-  ARY : []
-  def foo : (Integer, String) -> []
+  ARY : Array[bot]
+  private
+  def foo : (Integer, String) -> Array[bot]
 end

data/smoke/array7.rb

@@ -9,5 +9,6 @@ foo
 __END__
 # Classes
 class Object
+  private
   def foo : -> (Array[Integer | String])
 end