typeprof 0.21.8 → 0.21.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 71c74382cb8602ed9c902218ec5066d20865cc8040e5af6737e8d8a0d19beca9
-  data.tar.gz: 2646a63cd334443a8dc716f99a5828fac960afdf80f8a0f8c8b5f289e6fb957d
+  metadata.gz: '06598fbcfb3ce3394271ccc6f97304d4cc902f57eb581c3341865a6a17b9ec27'
+  data.tar.gz: f9359077192046c0dc45884b64af37ddd06586866ad8231d292d5e7d013861ec
 SHA512:
-  metadata.gz: 9c0ca22252a4804152efafafb63c9c8d1d1fb2e796a9d17251f1634dc1393c7fcaac7f924d4a341a0699c5113c3fea8bb03714ceb287ded60bc7057cac7a640c
-  data.tar.gz: 899c481fc8a4a05787ab0e66064220b33b17f8f1f0f045b9a1d05d4ebdae1ea4cd62cfe552342588b5a2834491638303be5a2e05c4b00d99713fe4693a6c557a
+  metadata.gz: 3c72b7cf70f321c75b42f2addacfa2a27f9cfa3f5c010ae0b430e3385e3d3befaf749a190d57d9228976afa48e56d91d8a8abab2823c69401c17dd8523ee2697
+  data.tar.gz: 1cfc46a0c0ac7bd5e7ec96c6a8f9e24c4854daa1ec1c830a0eb5af0348d2271865ca65400dca12cd892b6e33fd9929fae41d379064a1dceabc2d8dbf96292243

data/.github/workflows/main.yml

@@ -24,7 +24,7 @@ jobs:
         ruby: ${{ fromJson(needs.ruby-versions.outputs.versions) }}
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:

data/Gemfile.lock

@@ -1,17 +1,19 @@
 PATH
   remote: .
   specs:
-    typeprof (0.21.8)
+    typeprof (0.21.10)
       rbs (>= 1.8.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    abbrev (0.1.2)
     coverage-helpers (1.0.0)
     docile (1.4.0)
     power_assert (2.0.1)
     rake (13.0.1)
-    rbs (3.2.0)
+    rbs (3.4.3)
+      abbrev
     simplecov (0.21.2)
       docile (~> 1.1)
       simplecov-html (~> 0.11)

data/lib/typeprof/analyzer.rb

@@ -2137,7 +2137,7 @@ module TypeProf
           end
         end
         return
-      when :concatarray
+      when :concatarray, :concattoarray
         env, (ary1, ary2) = env.pop(2)
         if ary1.is_a?(Type::Local) && ary1.kind == Type::Array
           elems1 = get_container_elem_types(env, ep, ary1.id)
@@ -2156,6 +2156,20 @@ module TypeProf
           env, ty = localize_type(ty, env, ep)
           env = env.push(ty)
         end
+      when :pushtoarray
+        num, = operands
+        env, (ary, ty, *tys) = env.pop(num + 1)
+        if ary.is_a?(Type::Local) && ary.kind == Type::Array
+          tys.each {|ty0| ty = ty.union(ty0) }
+          elems = get_container_elem_types(env, ep, ary.id)
+          elems = Type::Array::Elements.new([], elems.squash.union(ty))
+          env = update_container_elem_types(env, ep, ary.id, ary.base_type) { elems }
+          env = env.push(ary)
+        else
+          elems = Type::Array::Elements.new([], Type.any)
+          env = update_container_elem_types(env, ep, ary.id, ary.base_type) { elems }
+          env = env.push(ary)
+        end
 
       when :checktype
         kind, = operands

data/lib/typeprof/insns-def.rb

@@ -32,6 +32,8 @@ TypeProf::INSN_TABLE = {:nop=>[],
  :duphash=>["VALUE"],
  :expandarray=>["rb_num_t", "rb_num_t"],
  :concatarray=>[],
+ :concattoarray=>[],
+ :pushtoarray=>["rb_num_t"],
  :splatarray=>["VALUE"],
  :newhash=>["rb_num_t"],
  :newrange=>["rb_num_t"],

data/lib/typeprof/iseq.rb

@@ -276,7 +276,7 @@ module TypeProf
               misc[:def_node_id] = node_id
             end
           end
-          ninsns << Insn.new(insn, operands, lineno, code_range, nil)
+          ninsns << i = Insn.new(insn, operands, lineno, code_range, nil)
         else
           raise "unknown iseq entry: #{ e }"
         end
@@ -840,10 +840,15 @@ module TypeProf
         sp -= 1
         return nil if sp <= 0
         sp += num + (splat ? 1 : 0)
-      when :concatarray
+      when :concatarray, :concattoarray
         sp -= 2
         return nil if sp <= 0
         sp += 1
+      when :pushtoarray
+        num, = operands
+        sp -= num + 1
+        return nil if sp <= 0
+        sp += 1
       when :checktype
         sp -= 1
         return nil if sp <= 0

data/lib/typeprof/type.rb

@@ -734,14 +734,19 @@ module TypeProf
 
       def []=(k_ty, v_ty)
         k_ty.each_child_global do |k_ty|
-          # This is a temporal hack to mitigate type explosion
-          k_ty = Type.any if k_ty.is_a?(Type::Array)
-          k_ty = Type.any if k_ty.is_a?(Type::Hash)
-
-          if @map_tys[k_ty]
-            @map_tys[k_ty] = @map_tys[k_ty].union(v_ty)
+          if k_ty.is_a?(Type::Union)
+            # Flatten recursive union
+            self[k_ty] = v_ty
           else
-            @map_tys[k_ty] = v_ty
+            # This is a temporal hack to mitigate type explosion
+            k_ty = Type.any if k_ty.is_a?(Type::Array)
+            k_ty = Type.any if k_ty.is_a?(Type::Hash)
+
+            if @map_tys[k_ty]
+              @map_tys[k_ty] = @map_tys[k_ty].union(v_ty)
+            else
+              @map_tys[k_ty] = v_ty
+            end
           end
         end
       end

data/lib/typeprof/version.rb

@@ -1,3 +1,3 @@
 module TypeProf
-  VERSION = "0.21.8"
+  VERSION = "0.21.10"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: typeprof
 version: !ruby/object:Gem::Version
-  version: 0.21.8
+  version: 0.21.10
 platform: ruby
 authors:
 - Yusuke Endoh
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-08-28 00:00:00.000000000 Z
+date: 2024-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rbs
@@ -89,7 +89,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.0.dev
+rubygems_version: 3.6.0.dev
 signing_key:
 specification_version: 4
 summary: TypeProf is a type analysis tool for Ruby code based on abstract interpretation