Fix rescue clause install

Author: smasato

lib/typeprof/core/ast/control.rb

@@ -392,11 +392,77 @@ def undefine0(genv)
 
       def install0(genv)
         ret = Vertex.new(self)
+
+        vars = []
+        @body.modified_vars(@lenv.locals.keys, vars) if @body
+        @rescue_clauses.each do |clause|
+          clause.modified_vars(@lenv.locals.keys, vars)
+        end
+        @else_clause.modified_vars(@lenv.locals.keys, vars) if @else_clause
+        @ensure_clause.modified_vars(@lenv.locals.keys, vars) if @ensure_clause
+        vars.uniq!
+
+        old_vtxs = {}
+        vars.each do |var|
+          vtx = @lenv.get_var(var)
+          old_vtxs[var] = vtx
+        end
+
         @changes.add_edge(genv, @body.install(genv), ret)
-        @rescue_conds.each {|cond| cond.install(genv) }
-        @rescue_clauses.each {|clause| @changes.add_edge(genv, clause.install(genv), ret) }
-        @changes.add_edge(genv, @else_clause.install(genv), ret) if @else_clause
+
+        body_vtxs = {}
+        vars.each do |var|
+          body_vtxs[var] = @lenv.get_var(var)
+        end
+
+        @rescue_conds.each { |cond| cond.install(genv) }
+
+        rescue_vtxs = []
+        @rescue_clauses.each do |clause|
+          vars.each do |var|
+            old_vtx = old_vtxs[var]
+            nvtx = old_vtx.new_vertex(genv, self)
+
+            if body_vtxs[var]
+              @changes.add_edge(genv, body_vtxs[var], nvtx)
+            end
+
+            @lenv.set_var(var, nvtx)
+          end
+
+          @changes.add_edge(genv, clause.install(genv), ret)
+
+          rescue_vtxs << {}
+          vars.each do |var|
+            rescue_vtxs.last[var] = @lenv.get_var(var)
+          end
+        end
+
+        if @else_clause
+          vars.each do |var|
+            @lenv.set_var(var, body_vtxs[var])
+          end
+          @changes.add_edge(genv, @else_clause.install(genv), ret)
+        end
+
         @ensure_clause.install(genv) if @ensure_clause
+
+        result_vtxs = {}
+        vars.each do |var|
+          result_vtx = old_vtxs[var].new_vertex(genv, self)
+          result_vtxs[var] = result_vtx
+
+          @changes.add_edge(genv, body_vtxs[var], result_vtx)
+
+          rescue_vtxs.each do |rescue_vtx|
+            @changes.add_edge(genv, rescue_vtx[var], result_vtx)
+          end
+        end
+
+        vars.each do |var|
+          @lenv.set_var(var, result_vtxs[var])
+        end
+
         ret
       end
     end

scenario/control/rescue.rb

@@ -12,7 +12,6 @@ def foo(n)
   rescue SyntaxError
     :b
   rescue Exception
-    ## TODO: bar should accept "Integer | String" ???
     bar(n)
   else
     :d
@@ -28,7 +27,7 @@ def baz(n)
 
 ## assert
 class Object
-  def bar: (String) -> :c
+  def bar: (Integer | String) -> :c
   def foo: (Integer) -> (:a | :b | :c | :d | Float)
   def baz: (Integer) -> (:a | Integer)
 end