typeprof 0.21.3 → 0.21.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 87b881146ffc3f78049ac01775f0bd6cae8efeec13a77da7eab2a61e3027a802
-  data.tar.gz: 61507f6552b6440fa58ea298ed80956a32e97b149b46d0969a594e8d1b0920bc
+  metadata.gz: c0f10007471912f793ce801817a088aa794bc4baeb15e5179362521f55e41ec0
+  data.tar.gz: ed61a2b2f4b9800cfb9c9e75d7aa0d0a5690ec1660e509dd4da456b60d1d03e7
 SHA512:
-  metadata.gz: dce6a8c024aa553089224545ca89a6148a590390791f9411b6a70791ad23cb70a9e97d4405264882c3cfccc8cd30e69443cc6330cb81c33f996fa2363dc0369a
-  data.tar.gz: c6f6e02dc30a6c8b7ecbee01f05f171b467a95526b4541173b303803287ea208eb816223353a704866b7f0b87b266462560554bb997bdbe67d3b5c9373385a4f
+  metadata.gz: 218064fc39d5eeacfe48c8babb28cfade5a069703d71ec4fb45f1a436491596006a01e46b63a14a25c611924176e7bc7aa5131a687c48f9c35b9d84e03e044e8
+  data.tar.gz: 61cca1138af6ab08bb91b9e05cd03a27de7c43bd13a36b9aa5522dffb1a118cb67f4494b0f109097572aa787a334be822773c6fedd87b3f1bcce1d7d221d7eba

data/.github/dependabot.yml

@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: 'github-actions'
+    directory: '/'
+    schedule:
+      interval: 'weekly'

data/.github/workflows/main.yml

@@ -7,19 +7,26 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby-version: [2.7, 3.0, 3.1, head]
+        ruby-version: [2.7, 3.0, 3.1, 3.2, head]
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3
-      with:
-        submodules: true
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby-version }}
-    - name: Bundle install
-      run: |
-        bundle install
+        bundler-cache: true
     - name: Run the test suite
       run: |
         bundle exec rake TESTOPT=-v
+
+  truffleruby:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: truffleruby
+        bundler-cache: true
+    - run: bundle exec typeprof --version

data/Gemfile

@@ -1,11 +1,15 @@
 source "https://rubygems.org"
 
-# Specify your gem's dependencies in typeprof.gemspec
-gemspec
+if ENV["RBS_VERSION"]
+  gem "rbs", github: "ruby/rbs", ref: ENV["RBS_VERSION"]
+else
+  # Specify your gem's dependencies in typeprof.gemspec
+  gemspec
+end
 
 group :development do
   gem "rake"
-  gem "stackprof"
+  gem "stackprof", platforms: :mri
   gem "test-unit"
   gem "simplecov"
   gem "simplecov-html"

data/Gemfile.lock

@@ -10,8 +10,8 @@ GEM
     coverage-helpers (1.0.0)
     docile (1.4.0)
     power_assert (2.0.1)
-    rake (13.0.6)
-    rbs (2.6.0)
+    rake (13.0.1)
+    rbs (2.8.3)
     simplecov (0.21.2)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
@@ -36,4 +36,4 @@ DEPENDENCIES
   typeprof!
 
 BUNDLED WITH
-   2.2.15
+   2.3.11

data/lib/typeprof/analyzer.rb

@@ -1997,7 +1997,8 @@ module TypeProf
             env = env.push(Type.any) # or String | NilClass only?
           when 1 # VM_SVAR_BACKREF ($~)
             merge_env(ep.next, env.push(Type::Instance.new(Type::Builtin[:matchdata])))
-            merge_env(ep.next, env.push(Type.nil))
+            # tentatively disabled; it is too conservative
+            #merge_env(ep.next, env.push(Type.nil))
             return
           else # flip-flop
             env = env.push(Type.bool)
@@ -2005,7 +2006,8 @@ module TypeProf
         else
           # NTH_REF ($1, $2, ...) / BACK_REF ($&, $+, ...)
           merge_env(ep.next, env.push(Type::Instance.new(Type::Builtin[:str])))
-          merge_env(ep.next, env.push(Type.nil))
+          # tentatively disabled; it is too conservative
+          #merge_env(ep.next, env.push(Type.nil))
           return
         end
       when :setspecial

data/lib/typeprof/import.rb

@@ -170,7 +170,12 @@ module TypeProf
             when RBS::AST::Members::MethodDefinition
               name = member.name
 
-              method_types = member.types.map do |method_type|
+              if member.respond_to?(:overloads)
+                types = member.overloads.map {|overload| overload.method_type }
+              else
+                types = member.types
+              end
+              method_types = types.map do |method_type|
                 case method_type
                 when RBS::MethodType then method_type
                 when :super then raise NotImplementedError
@@ -180,7 +185,7 @@ module TypeProf
               method_def = conv_method_def(method_types, visibility)
               rbs_source = [
                 (member.kind == :singleton ? "self." : "") + member.name.to_s,
-                member.types.map {|type| type.location.source },
+                types.map {|type| type.location.source },
                 [member.location.name, CodeRange.from_rbs(member.location)],
               ]
               if member.instance?

data/lib/typeprof/iseq.rb

@@ -1,11 +1,13 @@
 module TypeProf
   class ISeq
-    # https://github.com/ruby/ruby/pull/4468
-    CASE_WHEN_CHECKMATCH = RubyVM::InstructionSequence.compile("case 1; when Integer; end").to_a.last.any? {|insn,| insn == :checkmatch }
-    # https://github.com/ruby/ruby/blob/v3_0_2/vm_core.h#L1206
-    VM_ENV_DATA_SIZE = 3
-    # Check if Ruby 3.1 or later
-    RICH_AST = begin RubyVM::AbstractSyntaxTree.parse("1", keep_script_lines: true).node_id; true; rescue; false; end
+    if defined?(RubyVM::InstructionSequence)
+      # https://github.com/ruby/ruby/pull/4468
+      CASE_WHEN_CHECKMATCH = RubyVM::InstructionSequence.compile("case 1; when Integer; end").to_a.last.any? {|insn,| insn == :checkmatch }
+      # https://github.com/ruby/ruby/blob/v3_0_2/vm_core.h#L1206
+      VM_ENV_DATA_SIZE = 3
+      # Check if Ruby 3.1 or later
+      RICH_AST = begin RubyVM::AbstractSyntaxTree.parse("1", keep_script_lines: true).node_id; true; rescue; false; end
+    end
 
     FileInfo = Struct.new(
       :node_id2node,
@@ -447,6 +449,11 @@ module TypeProf
           insn.insn, insn.operands = :branch, [:nil] + insn.operands
         when :getblockparam, :getblockparamproxy
           insn.insn = :getlocal
+        when :getglobal
+          if insn.operands == [:$typeprof]
+            insn.insn = :putobject
+            insn.operands = [true]
+          end
         end
       end
     end
@@ -687,6 +694,27 @@ module TypeProf
           @insns[i + 1] = Insn.new(:getlocal_branch, [getlocal_operands, branch_operands])
         end
       end
+
+      # find a pattern: putobject, branch
+      (@insns.size - 1).times do |i|
+        next if branch_targets[i + 1]
+        insn0 = @insns[i]
+        insn1 = @insns[i + 1]
+        if insn0.insn == :putobject && insn1.insn == :branch
+          putobject_operands = insn0.operands
+          branch_operands = insn1.operands
+          obj = putobject_operands[0]
+          branch_type = branch_operands[0]
+          branch_target = branch_operands[1]
+          case branch_type
+          when :if     then jump = !!obj
+          when :unless then jump = !obj
+          when :nil    then jump = obj == nil
+          end
+          @insns[i    ] = Insn.new(:nop, [])
+          @insns[i + 1] = jump ? Insn.new(:jump, [branch_target]) : Insn.new(:nop, [])
+        end
+      end
     end
 
     def check_send_branch(sp, j)

data/lib/typeprof/type.rb

@@ -59,10 +59,13 @@ module TypeProf
         else
           if ty2.is_a?(Type::ContainerType)
             # ty2 may have type variables
-            return nil if ty1.class != ty2.class
-            ty1.match?(ty2)
+            if ty1.class == ty2.class
+              ty1.match?(ty2)
+            else
+              Type.match?(ty1, ty2.base_type)
+            end
           elsif ty1.is_a?(Type::ContainerType)
-            nil
+            Type.match?(ty1.base_type, ty2)
           else
             ty1.consistent?(ty2) ? {} : nil
           end
@@ -810,7 +813,9 @@ module TypeProf
       when :$0, :$PROGRAM_NAME
         Type::Instance.new(Type::Builtin[:str])
       when :$~
-        Type.optional(Type::Instance.new(Type::Builtin[:matchdata]))
+        # optional type is tentatively disabled; it is too conservative
+        #Type.optional(Type::Instance.new(Type::Builtin[:matchdata]))
+        Type::Instance.new(Type::Builtin[:matchdata])
       when :$., :$$
         Type::Instance.new(Type::Builtin[:int])
       when :$?

data/lib/typeprof/version.rb

@@ -1,3 +1,3 @@
 module TypeProf
-  VERSION = "0.21.3"
+  VERSION = "0.21.4"
 end

data/lib/typeprof.rb

@@ -17,4 +17,4 @@ require_relative "typeprof/builtin"
 require_relative "typeprof/cli"
 require_relative "typeprof/code-range"
 
-require_relative "typeprof/lsp" if RUBY_VERSION >= "3"
+require_relative "typeprof/lsp" if RUBY_VERSION >= "3" and RUBY_ENGINE != "truffleruby"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: typeprof
 version: !ruby/object:Gem::Version
-  version: 0.21.3
+  version: 0.21.4
 platform: ruby
 authors:
 - Yusuke Endoh
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-07-06 00:00:00.000000000 Z
+date: 2023-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rbs
@@ -37,6 +37,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/dependabot.yml"
 - ".github/workflows/main.yml"
 - ".gitignore"
 - Gemfile
@@ -73,7 +74,7 @@ licenses:
 metadata:
   homepage_uri: https://github.com/ruby/typeprof
   source_code_uri: https://github.com/ruby/typeprof
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -88,8 +89,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
-signing_key: 
+rubygems_version: 3.3.26
+signing_key:
 specification_version: 4
 summary: TypeProf is a type analysis tool for Ruby code based on abstract interpretation
 test_files: []