typeprof 0.5.3 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b1281ceb7a6a28b6dec33aad740d0fa52429a17ca29d57747717247fdb449c79
-  data.tar.gz: 3ad79ab67ba6080e0c1da2b46671012e4db2f886020a11772158449ffd85717b
+  metadata.gz: 2d60066fe3965ec65f9885e311f856277d0e41330478489c026fdf6b387ba2ba
+  data.tar.gz: 963b66fe97d98207d72645011bcd012368937ded76278d92a4b677b961c92cdc
 SHA512:
-  metadata.gz: c0e888c0c1cc871b23592f29d138f7c9c8ca5370fa98699c9b504aa29c79796f58d97653fac98cef2df1d8e7f5c961942ee28d385a95695e4ce7f1ff3c8d24f5
-  data.tar.gz: 3ee4de72a8e26aed401b1879575ef82c0b1215fe9ccb87ee2c781a8138becc9ab948aea00e07e8e344ca4f96610ebfefdc540f175253cfe32dca1f721c232e7f
+  metadata.gz: a40e89e05c1680480eb66798863ab99a4b38b3faaacdc471a6cdd45dfc1f897efcc8f613800ef28e5bc722c3504dec510ca943435873b6cb765a27f1bb073425
+  data.tar.gz: 94dddf2c3e465ee19093ce571d50440293118b07ab7c90203aa5ccb40c4f9eb9afe1059eff045c965006affa8f0d66d141be2064feddf9a2b1f8384f8cadae64

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    typeprof (0.5.2)
+    typeprof (0.5.4)
       rbs (>= 0.17.0)
 
 GEM

data/lib/typeprof/analyzer.rb

@@ -252,6 +252,8 @@ module TypeProf
       @rbs_reader = RBSReader.new
 
       @terminated = false
+
+      @anonymous_struct_gen_id = 0
     end
 
     attr_reader :return_envs, :loaded_features, :rbs_reader
@@ -397,8 +399,9 @@ module TypeProf
 
       idx = @class_defs.size
       superclass = Type::Builtin[:struct]
-      @class_defs[idx] = ClassDef.new(:class, ["(Anonymous Struct)"], superclass.idx, ep.ctx.iseq.absolute_path)
-      klass = Type::Class.new(:class, idx, [], superclass, "(Anonymous Struct)")
+      name = "AnonymousStruct_generated_#{ @anonymous_struct_gen_id += 1 }"
+      @class_defs[idx] = ClassDef.new(:class, [name], superclass.idx, ep.ctx.iseq.absolute_path)
+      klass = Type::Class.new(:class, idx, [], superclass, name)
       @class_defs[idx].klass_obj = klass
 
       @struct_defs[ep] = klass
@@ -1132,35 +1135,29 @@ module TypeProf
           else
             if existing_klass != Type.any
               error(ep, "the class \"#{ id }\" is #{ existing_klass.screen_name(self) }")
-              id = :"#{ id }(dummy)"
             end
-            existing_klass = get_constant(cbase, id) # TODO: multiple return values
-            if existing_klass != Type.any
-              klass = existing_klass
-            else
-              if type == :class
-                if superclass.is_a?(Type::Class)
-                  # okay
-                elsif superclass == Type.any
-                  warn(ep, "superclass is any; Object is used instead")
-                  superclass = Type::Builtin[:obj]
-                elsif superclass == Type.nil
-                  superclass = Type::Builtin[:obj]
-                elsif superclass.is_a?(Type::Instance)
-                  warn(ep, "superclass is an instance; Object is used instead")
-                  superclass = Type::Builtin[:obj]
-                else
-                  warn(ep, "superclass is not a class; Object is used instead")
-                  superclass = Type::Builtin[:obj]
-                end
-              else # module
-                superclass = nil
-              end
-              if cbase == Type.any
-                klass = Type.any
+            if type == :class
+              if superclass.is_a?(Type::Class)
+                # okay
+              elsif superclass == Type.any
+                warn(ep, "superclass is any; Object is used instead")
+                superclass = Type::Builtin[:obj]
+              elsif superclass == Type.nil
+                superclass = Type::Builtin[:obj]
+              elsif superclass.is_a?(Type::Instance)
+                warn(ep, "superclass is an instance; Object is used instead")
+                superclass = Type::Builtin[:obj]
               else
-                klass = new_class(cbase, id, [], superclass, ep.ctx.iseq.absolute_path)
+                warn(ep, "superclass is not a class; Object is used instead")
+                superclass = Type::Builtin[:obj]
               end
+            else # module
+              superclass = nil
+            end
+            if cbase == Type.any
+              klass = Type.any
+            else
+              klass = new_class(cbase, id, [], superclass, ep.ctx.iseq.absolute_path)
             end
           end
           singleton = false

data/lib/typeprof/container-type.rb

@@ -306,6 +306,9 @@ module TypeProf
 
         def screen_name(scratch)
           if Config.options[:show_container_raw_elements] || @rest_ty == Type.bot
+            if @lead_tys.empty?
+              return "Array[bot]" # RBS does not allow an empty tuple "[]"
+            end
             s = @lead_tys.map do |ty|
               ty.screen_name(scratch)
             end
@@ -631,16 +634,22 @@ module TypeProf
         end
 
         def screen_name(scratch)
-          s = @map_tys.map do |k_ty, v_ty|
-            v = v_ty.screen_name(scratch)
-            if k_ty.is_a?(Type::Symbol)
+          if !@map_tys.empty? && @map_tys.all? {|k_ty,| k_ty.is_a?(Type::Symbol) }
+            s = @map_tys.map do |k_ty, v_ty|
+              v = v_ty.screen_name(scratch)
               "#{ k_ty.sym }: #{ v }"
-            else
-              k = k_ty.screen_name(scratch)
-              "#{ k }=>#{ v }"
+            end.join(", ")
+            "{#{ s }}"
+          else
+            k_ty = v_ty = Type.bot
+            @map_tys.each do |k, v|
+              k_ty = k_ty.union(k)
+              v_ty = v_ty.union(v)
             end
-          end.join(", ")
-          "{#{ s }}"
+            k_ty = k_ty.screen_name(scratch)
+            v_ty = v_ty.screen_name(scratch)
+            "Hash[#{ k_ty }, #{ v_ty }]"
+          end
         end
 
         def pretty_print(q)

data/lib/typeprof/type.rb

@@ -449,7 +449,7 @@ 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)
@@ -785,6 +785,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|

data/lib/typeprof/version.rb

@@ -1,3 +1,3 @@
 module TypeProf
-  VERSION = "0.5.3"
+  VERSION = "0.5.4"
 end

data/smoke/array11.rb

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

data/smoke/array6.rb

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

data/smoke/array8.rb

@@ -9,5 +9,5 @@ end
 __END__
 # Classes
 class Foo
-  def self.foo : ([]) -> []
+  def self.foo : (Array[bot]) -> Array[bot]
 end

data/smoke/block-args2.rb

@@ -47,11 +47,11 @@ __END__
 # Classes
 class Object
   def f1 : { -> nil } -> ^(nil, *bot, nil) -> nil
-  def log1 : (nil, [], nil) -> nil
+  def log1 : (nil, Array[bot], nil) -> nil
   def f2 : { (:a) -> nil } -> ^(:a, *bot, nil) -> nil
-  def log2 : (:a, [], nil) -> nil
+  def log2 : (:a, Array[bot], nil) -> nil
   def f3 : { (:a, :b) -> nil } -> ^(:a, *bot, :b) -> nil
-  def log3 : (:a, [], :b) -> nil
+  def log3 : (:a, Array[bot], :b) -> nil
   def f4 : { (:a, :b, :c) -> nil } -> ^(:a, *:b, :c) -> nil
   def log4 : (:a, [:b], :c) -> nil
   def f5 : { (:a, :b, :c, :d) -> nil } -> (^(:a, *:b | :c, :d) -> nil)

data/smoke/block-args3.rb

@@ -56,13 +56,13 @@ __END__
 # Classes
 class Object
   def f1 : { -> nil } -> ^(nil, ?:opt, *bot, nil) -> nil
-  def log1 : (nil, :opt, [], nil) -> nil
+  def log1 : (nil, :opt, Array[bot], nil) -> nil
   def f2 : { (:a) -> nil } -> ^(:a, ?:opt, *bot, nil) -> nil
-  def log2 : (:a, :opt, [], nil) -> nil
+  def log2 : (:a, :opt, Array[bot], nil) -> nil
   def f3 : { (:a, :b) -> nil } -> ^(:a, ?:opt, *bot, :b) -> nil
-  def log3 : (:a, :opt, [], :b) -> nil
+  def log3 : (:a, :opt, Array[bot], :b) -> nil
   def f4 : { (:a, :b, :c) -> nil } -> (^(:a, ?:b | :opt, *bot, :c) -> nil)
-  def log4 : (:a, :b | :opt, [], :c) -> nil
+  def log4 : (:a, :b | :opt, Array[bot], :c) -> nil
   def f5 : { (:a, :b, :c, :d) -> nil } -> (^(:a, ?:b | :opt, *:c, :d) -> nil)
   def log5 : (:a, :b | :opt, [:c], :d) -> nil
   def f6 : { (:a, :b, :c, :d, :e) -> nil } -> (^(:a, ?:b | :opt, *:c | :d, :e) -> nil)

data/smoke/block-blockarg.rb

@@ -23,5 +23,5 @@ class Object
   def log1 : (:a) -> nil
   def log2 : (:b) -> nil
   def log3 : (:c) -> nil
-  def f : { { (:a) -> :b } -> :c } -> :d
+  def f : { -> :c } -> :d
 end

data/smoke/block5.rb

@@ -15,5 +15,5 @@ __END__
 # Classes
 class Object
   F : ^(Integer) -> String
-  def foo : { (:sym) { (Integer) -> String } -> String } -> String
+  def foo : { (:sym) -> String } -> String
 end

data/smoke/constant2.rb

@@ -24,12 +24,11 @@ smoke/constant2.rb:15: [warning] already initialized constant Object::BAR
 
 # Classes
 class Object
-  C : String
   BAR : String
   def foo : (Integer | untyped) -> nil
   def log : (String) -> nil
 end
 
-class C(dummy)
+class C
   def foo : -> nil
 end

data/smoke/demo5.rb

@@ -9,7 +9,7 @@ B.foo(Integer)
 __END__
 # Classes
 class A
-  def self.foo : (Integer | Integer.class) -> String
+  def self.foo : (Integer | singleton(Integer)) -> String
 end
 
 class B < A

data/smoke/demo9.rb

@@ -12,5 +12,5 @@ __END__
 # Classes
 class Object
   F : ^(Integer) -> String
-  def foo : { (:sym) { (Integer) -> String } -> String } -> String
+  def foo : { (:sym) -> String } -> String
 end

data/smoke/hash1.rb

@@ -5,6 +5,7 @@ end
 foo
 
 def bar
+  # This returns {Integer=>Integer | String, String=>String} but RBS cannot express it
   { 1 => 1, 2 => "str", "s" => "s" }
 end
 
@@ -14,5 +15,5 @@ __END__
 # Classes
 class Object
   def foo : -> {int: Integer, str: String}
-  def bar : -> ({Integer=>Integer | String, String=>String})
+  def bar : -> (Hash[Integer | String, Integer | String])
 end

data/smoke/hash4.rb

@@ -6,5 +6,5 @@ foo
 __END__
 # Classes
 class Object
-  def foo : -> {}
+  def foo : -> Hash[bot, bot]
 end

data/smoke/inheritance2.rb

@@ -21,11 +21,11 @@ end
 __END__
 # Classes
 class SuperBase
-  def self.foo : -> (A.class | B.class)
+  def self.foo : -> (singleton(A) | singleton(B))
 end
 
 class Base < SuperBase
-  def self.foo : -> (A.class | B.class)
+  def self.foo : -> (singleton(A) | singleton(B))
 end
 
 class A < Base

data/smoke/ivar2.rb

@@ -25,6 +25,6 @@ __END__
 class Foo
   attr_reader array : Array[:sym | Integer | String]
   attr_reader hash : {a: Integer, b: String, c: :sym}
-  def initialize : -> {}
+  def initialize : -> Hash[bot, bot]
   def set : -> :sym
 end

data/smoke/kernel-class.rb

@@ -8,5 +8,5 @@ foo("")
 __END__
 # Classes
 class Object
-  def foo : (Integer | String) -> (Integer.class | String.class)
+  def foo : (Integer | String) -> (singleton(Integer) | singleton(String))
 end

data/smoke/kwsplat1.rb

@@ -38,5 +38,5 @@ class Object
   def foo : (k: Integer) -> nil
   def bar : (int: Integer, str: String) -> nil
   def baz : (**{int: Integer, str: String}) -> nil
-  def qux : (**{untyped=>untyped}) -> nil
+  def qux : (**Hash[untyped, untyped]) -> nil
 end

data/smoke/multiple-superclass.rb

@@ -15,7 +15,7 @@ smoke/multiple-superclass.rb:9: [warning] superclass is not a class; Object is u
 
 # Classes
 class Object
-  Base : A.class | B.class
+  Base : singleton(A) | singleton(B)
 end
 
 class A

data/smoke/parameterizedd-self.rb

@@ -13,6 +13,6 @@ bar([])
 __END__
 # Classes
 class Object
-  def foo : -> []
-  def bar : ([]) -> []
+  def foo : -> Array[bot]
+  def bar : (Array[bot]) -> Array[bot]
 end

data/smoke/struct.rb

@@ -5,9 +5,9 @@ end
 Foo.new.a = 1
 __END__
 # Classes
-class (Anonymous Struct) < Struct
+class AnonymousStruct_generated_1 < Struct
   attr_accessor a() : untyped
 end
 
-class Foo < (Anonymous Struct)
+class Foo < AnonymousStruct_generated_1
 end

data/smoke/union-recv.rb

@@ -21,11 +21,11 @@ end
 __END__
 # Classes
 class SuperBase
-  def self.foo : -> (A.class | B.class)
+  def self.foo : -> (singleton(A) | singleton(B))
 end
 
 class Base < SuperBase
-  def self.foo : -> (A.class | B.class)
+  def self.foo : -> (singleton(A) | singleton(B))
 end
 
 class A < Base

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: typeprof
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
 platform: ruby
 authors:
 - Yusuke Endoh
@@ -334,7 +334,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.0.rc.2
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: TypeProf is a type analysis tool for Ruby code based on abstract interpretation