typeprof 0.31.0 → 0.31.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: af1ca7b849fb94f4a39e31b3e1b2c45b557936f68099002d69a25d09e2c76b51
-  data.tar.gz: cf3d5e1e88614b53a354f874ed0560e6b6bd965468e3be5f024594cf633e4b8d
+  metadata.gz: 937e0870f11951c34a3c7903f0c6e02b2ba0b557d327999a8ce807e195409088
+  data.tar.gz: ab8eca2e1cbb24729bbc0274bce7ed3ddd59917accd81285069ebc0086fe0208
 SHA512:
-  metadata.gz: 84eec1b1d33b57ba5022bacab1f194a5942789282c3e19fcb32f2b4d3168f4ff826b5d176982a5ba36b7bbe3bba9f0fef5a0cb927811cba89b759ef337ab72f6
-  data.tar.gz: b196e236660ab1814456fd9586e122e135e7773e27c3f49151e6c7a18a015b8ac0562a08c1b740a1d8bcfcd0005c27aefa2dabbaf98085230fcff73933f8028b
+  metadata.gz: 40b2629987ea3feed461c74c279cabb25ad462c0e0118d3d451c12387de4cdbab39b1dd1301ee86ceb6f6f5bbb25b4c5425a72749a11eabe2485a35ea463e5a3
+  data.tar.gz: c8704511e6507f9e50df4b626fb9b481e945954688df4d6c26ecd233b530eb4f1e2e038589c2538f209e9f6cec15c26401d854f48d8ea346325507f29246a475

data/lib/typeprof/core/ast/misc.rb

@@ -139,6 +139,63 @@ module TypeProf::Core
       end
     end
 
+    class MultiTargetNode < Node
+      def initialize(raw_node, rhs, lenv)
+        super(raw_node, lenv)
+        @rhs = rhs
+        @lefts = raw_node.lefts.map do |raw_lhs|
+          AST.create_target_node(raw_lhs, lenv)
+        end
+        if raw_node.rest
+          case raw_node.rest.type
+          when :splat_node
+            if raw_node.rest.expression
+              @rest = AST.create_target_node(raw_node.rest.expression, lenv)
+            end
+          when :implicit_rest_node
+            # no assignment target
+          else
+            raise "unexpected rest node in multi_target: #{raw_node.rest.type}"
+          end
+        end
+        @rights = raw_node.rights.map do |raw_rhs|
+          AST.create_target_node(raw_rhs, lenv)
+        end
+      end
+
+      attr_reader :rhs, :lefts, :rest, :rights
+
+      def subnodes = { rhs:, lefts:, rest:, rights: }
+
+      def install0(genv)
+        # The rhs should be installed by the parent MultiWriteNode
+        # Here we set up the multi-assignment box for nested destructuring
+        value = @rhs.install(genv)
+
+        @lefts.each {|lhs| lhs.install(genv) }
+        @lefts.each {|lhs| lhs.rhs.ret || raise(lhs.rhs.inspect) }
+        lefts = @lefts.map {|lhs| lhs.rhs.ret }
+
+        rest_elem = nil
+        if @rest
+          rest_elem = Vertex.new(self)
+          @rest.install(genv)
+          @rest.rhs.ret || raise(@rest.rhs.inspect)
+          @changes.add_edge(genv, Source.new(Type::Instance.new(genv, genv.mod_ary, [rest_elem])), @rest.rhs.ret)
+        end
+
+        rights = nil
+        if @rights && !@rights.empty?
+          @rights.each {|rhs| rhs.install(genv) }
+          @rights.each {|rhs| rhs.rhs.ret || raise(rhs.rhs.inspect) }
+          rights = @rights.map {|rhs| rhs.rhs.ret }
+        end
+
+        box = @changes.add_masgn_box(genv, value, lefts, rest_elem, rights)
+        box.ret
+      end
+    end
+
     class MatchWriteNode < Node
       def initialize(raw_node, lenv)
         super(raw_node, lenv)

data/lib/typeprof/core/ast/sig_type.rb

@@ -826,7 +826,7 @@ module TypeProf::Core
       end
 
       def typecheck(genv, changes, vtx, subst)
-        changes.add_edge(genv, vtx, subst[@var]) unless vtx == subst[@var]
+        changes.add_edge(genv, vtx.new_vertex(genv, self), subst[@var]) unless vtx == subst[@var]
         true
       end
 

data/lib/typeprof/core/ast.rb

@@ -270,6 +270,8 @@ module TypeProf::Core
         IndexWriteNode.new(raw_node, dummy_node, lenv)
       when :call_target_node
         CallWriteNode.new(raw_node, dummy_node, lenv)
+      when :multi_target_node
+        MultiTargetNode.new(raw_node, dummy_node, lenv)
       else
         pp raw_node
         raise "not supported yet: #{ raw_node.type }"

data/lib/typeprof/core/env.rb

@@ -116,6 +116,10 @@ module TypeProf::Core
         base_ty.mod.type_params.zip(base_ty.args) do |param, arg|
           ty_env[param] = arg || Source.new
         end
+      elsif base_ty.is_a?(Type::Singleton)
+        base_ty.mod.type_params&.each do |param|
+          ty_env[param] = Source.new
+        end
       end
       args = mod.type_params.zip(type_args).map do |param, arg|
         arg && changes ? arg.covariant_vertex(self, changes, ty_env) : Source.new

data/lib/typeprof/core/graph/box.rb

@@ -1073,7 +1073,7 @@ module TypeProf::Core
         else
           if @lefts.size >= 1
             edges << [Source.new(ty), @lefts[0]]
-          elsif @rights.size >= 1
+          elsif @rights && @rights.size >= 1
             edges << [Source.new(ty), @rights[0]]
           else
             edges << [Source.new(ty), @rest_elem]
@@ -1099,7 +1099,7 @@ module TypeProf::Core
     def run0(genv, changes)
       instance_tys = []
       @singleton_ty_vtx.each_type do |ty|
-        instance_tys << ty.get_instance_type(genv)
+        instance_tys << ty.get_instance_type(genv) if ty.is_a?(Type::Singleton)
       end
       source_vtx = Source.new(*instance_tys)
       changes.add_edge(genv, source_vtx, @ret)

data/lib/typeprof/core/type.rb

@@ -112,6 +112,7 @@ module TypeProf::Core
         edges = []
         state = :left
         j = nil
+        rights_size = rights ? rights.size : 0
         @elems.each_with_index do |elem, i|
           case state
           when :left
@@ -123,7 +124,7 @@ module TypeProf::Core
               redo
             end
           when :rest
-            if @elems.size - i > rights.size
+            if @elems.size - i > rights_size
               edges << [elem, rest_elem]
             else
               state = :right

data/lib/typeprof/version.rb

@@ -1,3 +1,3 @@
 module TypeProf
-  VERSION = "0.31.0"
+  VERSION = "0.31.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: typeprof
 version: !ruby/object:Gem::Version
-  version: 0.31.0
+  version: 0.31.1
 platform: ruby
 authors:
 - Yusuke Endoh