Replace contravariant_vertex+check_match with typecheck

Author: mame

lib/typeprof/core/ast/base.rb

@@ -9,13 +9,15 @@ def initialize(raw_node, lenv)
         @ret = nil
 
         @changes = ChangeSet.new(self, nil)
+        @diagnostics = Set[]
       end
 
       attr_reader :lenv
       attr_reader :prev_node
       attr_reader :static_ret
       attr_reader :ret
       attr_reader :changes
+      attr_reader :diagnostics
 
       def subnodes = {}
       def attrs = {}
@@ -99,6 +101,10 @@ def install(genv)
       def install_copy(genv)
         @changes.copy_from((@prev_node || raise).changes)
         @changes.reuse(self)
+        (@prev_node || raise).diagnostics.each do |diag|
+          diag.reuse(self)
+          @diagnostics << diag
+        end
         each_subnode do |subnode|
           subnode.install_copy(genv)
         end
@@ -120,6 +126,14 @@ def narrowings
         Narrowing::EmptyNarrowings
       end
 
+      def add_diagnostic(diag)
+        @diagnostics << diag
+      end
+
+      def remove_diagnostic(diag)
+        @diagnostics.delete(diag)
+      end
+
       def diff(prev_node)
         if prev_node.is_a?(self.class) && attrs.all? {|key, attr| attr == prev_node.send(key) }
           raise unless prev_node # annotation
@@ -163,13 +177,10 @@ def boxes(key)
         end
       end
 
-      def diagnostics(genv, &blk)
-        @changes.diagnostics.each(&blk)
-        @changes.boxes.each_value do |box|
-          box.diagnostics(genv, &blk)
-        end
+      def each_diagnostic(genv, &blk)
+        @diagnostics.each(&blk)
         each_subnode do |subnode|
-          subnode.diagnostics(genv, &blk)
+          subnode.each_diagnostic(genv, &blk)
         end
       end
 

lib/typeprof/core/ast/call.rb

@@ -130,9 +130,9 @@ def install0(genv)
             block_body.lenv.set_var(var, nvtx)
           end
 
-          e_ret = @block_body.lenv.locals[:"*expected_block_ret"] = Vertex.new(self)
+          @block_body.lenv.locals[:"*expected_block_ret"] = Vertex.new(self)
           @block_body.install(genv)
-          @block_body.lenv.add_next_box(@changes.add_escape_box(genv, @block_body.ret, e_ret))
+          @block_body.lenv.add_next_box(@changes.add_escape_box(genv, @block_body.ret))
 
           vars.each do |var|
             @changes.add_edge(genv, block_body.lenv.get_var(var), @lenv.get_var(var))

lib/typeprof/core/ast/control.rb

@@ -234,7 +234,7 @@ def subnodes = { arg: }
       def install0(genv)
         @arg.install(genv)
         if @lenv.exist_var?(:"*expected_block_ret")
-          @lenv.add_next_box(@changes.add_escape_box(genv, @arg.ret, @lenv.get_var(:"*expected_block_ret")))
+          @lenv.add_next_box(@changes.add_escape_box(genv, @arg.ret))
         end
         Source.new(Type::Bot.new(genv))
       end
@@ -495,7 +495,7 @@ def subnodes = { arg: }
       def install0(genv)
         @arg.install(genv)
         e_ret = @lenv.locals[:"*expected_method_ret"]
-        @lenv.add_return_box(@changes.add_escape_box(genv, @arg.ret, e_ret)) if e_ret
+        @lenv.add_return_box(@changes.add_escape_box(genv, @arg.ret)) if e_ret
         Source.new(Type::Bot.new(genv))
       end
     end

lib/typeprof/core/ast/meta.rb

@@ -79,8 +79,7 @@ def install0(genv)
         @args.each do |arg|
           ivar_name = :"@#{ arg }"
           ivar_box = @changes.add_ivar_read_box(genv, @lenv.cref.cpath, false, ivar_name)
-          e_ret = Vertex.new(self)
-          ret_box = @changes.add_escape_box(genv, ivar_box.ret, e_ret)
+          ret_box = @changes.add_escape_box(genv, ivar_box.ret)
           @changes.add_method_def_box(genv, @lenv.cref.cpath, false, arg, FormalArguments::Empty, [ret_box])
         end
         Source.new
@@ -136,8 +135,7 @@ def undefine0(genv)
       def install0(genv)
         @args.zip(@static_ret) do |arg, ive|
           ivar_box = @changes.add_ivar_read_box(genv, @lenv.cref.cpath, false, :"@#{ arg }")
-          e_ret = Vertex.new(self)
-          ret_box = @changes.add_escape_box(genv, ivar_box.ret, e_ret)
+          ret_box = @changes.add_escape_box(genv, ivar_box.ret)
           @changes.add_method_def_box(genv, @lenv.cref.cpath, false, arg, FormalArguments::Empty, [ret_box])
 
           vtx = Vertex.new(self)

lib/typeprof/core/ast/method.rb

@@ -248,9 +248,9 @@ def install0(genv)
         end
 
         if @body
-          e_ret = @body.lenv.locals[:"*expected_method_ret"] = Vertex.new(self)
+          @body.lenv.locals[:"*expected_method_ret"] = Vertex.new(self)
           @body.install(genv)
-          @body.lenv.add_return_box(@changes.add_escape_box(genv, @body.ret, e_ret))
+          @body.lenv.add_return_box(@changes.add_escape_box(genv, @body.ret))
         end
 
         f_args = FormalArguments.new(