typeprof 0.21.3 → 0.21.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 87b881146ffc3f78049ac01775f0bd6cae8efeec13a77da7eab2a61e3027a802
-  data.tar.gz: 61507f6552b6440fa58ea298ed80956a32e97b149b46d0969a594e8d1b0920bc
+  metadata.gz: 6586977939af7be53d8c86c57f992569abffac1f011e7a435ea248835fabb5be
+  data.tar.gz: fec9babce50e7c23b31d053a137d7b16c9481ab51bc694d5ba1bf9fd720f63e2
 SHA512:
-  metadata.gz: dce6a8c024aa553089224545ca89a6148a590390791f9411b6a70791ad23cb70a9e97d4405264882c3cfccc8cd30e69443cc6330cb81c33f996fa2363dc0369a
-  data.tar.gz: c6f6e02dc30a6c8b7ecbee01f05f171b467a95526b4541173b303803287ea208eb816223353a704866b7f0b87b266462560554bb997bdbe67d3b5c9373385a4f
+  metadata.gz: b49afd59c81f251f6526f4f297773983cad6e4ead9ffeff659d1257a5c0138f2b3f8016197fc5537b5bf1a53bebb1382bf3385ce377441a9bbff0f5852e0ac07
+  data.tar.gz: 3603cff083f9db951648cbc8069c017a42057eb6242963879634f7a0e64633632cb21e4bb51988f4a7d99e30de61e670e953409b64b6cc6bac5bbd771049666c

data/.github/dependabot.yml

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

data/.github/workflows/main.yml

@@ -1,25 +1,39 @@
 name: Ruby
 
-on: [push,pull_request]
+on:
+  push:
+  pull_request:
+  workflow_dispatch:
+  schedule:
+    #  # This job runs at 00:00 on Friday.
+    - cron: '0 15 * * 5'
 
 jobs:
+  ruby-versions:
+    uses: ruby/actions/.github/workflows/ruby_versions.yml@master
+    with:
+      engine: cruby-truffleruby
+      min_version: 2.7
+
   build:
+    needs: ruby-versions
+    name: build (${{ matrix.ruby }})
     strategy:
       fail-fast: false
       matrix:
-        ruby-version: [2.7, 3.0, 3.1, head]
+        ruby: ${{ fromJson(needs.ruby-versions.outputs.versions) }}
     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 }}
+        ruby-version: ${{ matrix.ruby }}
     - name: Bundle install
       run: |
         bundle install
+    - run: bundle exec typeprof --version
     - name: Run the test suite
       run: |
         bundle exec rake TESTOPT=-v
+      if: ${{ !startsWith(matrix.ruby, 'truffle') }}

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

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    typeprof (0.21.3)
+    typeprof (0.21.7)
       rbs (>= 1.8.1)
 
 GEM
@@ -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 (3.0.2)
     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
@@ -2229,6 +2231,34 @@ module TypeProf
       merge_env(ep.next, env)
     end
 
+    private def ruby_3_3_keywords?
+      @ruby_3_3_keywords ||=
+        RubyVM::InstructionSequence.compile("foo(*a, **b)").to_a.last[-2][1][:orig_argc] == 2
+    end
+
+    private def type_to_keywords(ty, ep)
+      case ty
+      when Type::Hash
+        ty.elems.to_keywords
+      when Type::Union
+        hash_elems = nil
+        ty.elems&.each do |(container_kind, base_type), elems|
+          if container_kind == Type::Hash
+            elems.to_keywords
+            hash_elems = hash_elems ? hash_elems.union(elems) : elems
+          end
+        end
+        if hash_elems
+          hash_elems.to_keywords
+        else
+          { nil => Type.any }
+        end
+      else
+        warn(ep, "non hash is passed to **kwarg?") unless ty == Type.any
+        { nil => Type.any }
+      end
+    end
+
     private def setup_actual_arguments(kind, operands, ep, env)
       opt, blk_iseq = operands
       flags = opt[:flag]
@@ -2282,42 +2312,33 @@ module TypeProf
       blk_ty = new_blk_ty
 
       if flag_args_splat
-        # assert !flag_args_kwarg
-        rest_ty = aargs.last
-        aargs = aargs[0..-2]
-        if flag_args_kw_splat
-          # XXX: The types contained in ActualArguments are expected to be all local types.
-          # This "globalize_type" breaks the invariant, and violates the assertion of Union#globalize that asserts @elems be nil.
-          # To fix this issue fundamentally, ActualArguments should keep all arguments as-is (as like the VM does),
-          # and globalize some types on the on-demand bases.
-          ty = globalize_type(rest_ty, env, ep)
-          if ty.is_a?(Type::Array)
-            _, (ty,) = ty.elems.take_last(1)
-            case ty
-            when Type::Hash
-              kw_tys = ty.elems.to_keywords
-            when Type::Union
-              hash_elems = nil
-              ty.elems&.each do |(container_kind, base_type), elems|
-                if container_kind == Type::Hash
-                  elems.to_keywords
-                  hash_elems = hash_elems ? hash_elems.union(elems) : elems
-                end
-              end
-              if hash_elems
-                kw_tys = hash_elems.to_keywords
-              else
-                kw_tys = { nil => Type.any }
-              end
+        if ruby_3_3_keywords?
+          if flag_args_kw_splat
+            kw_tys = type_to_keywords(globalize_type(aargs[-1], env, ep), ep)
+            aargs = aargs[0..-2]
+          else
+            kw_tys = {}
+          end
+          rest_ty = aargs.last
+          aargs = aargs[0..-2]
+        else
+          rest_ty = aargs.last
+          aargs = aargs[0..-2]
+          if flag_args_kw_splat
+            # XXX: The types contained in ActualArguments are expected to be all local types.
+            # This "globalize_type" breaks the invariant, and violates the assertion of Union#globalize that asserts @elems be nil.
+            # To fix this issue fundamentally, ActualArguments should keep all arguments as-is (as like the VM does),
+            # and globalize some types on the on-demand bases.
+            ty = globalize_type(rest_ty, env, ep)
+            if ty.is_a?(Type::Array)
+              _, (ty,) = ty.elems.take_last(1)
+              kw_tys = type_to_keywords(ty, ep)
             else
-              warn(ep, "non hash is passed to **kwarg?") unless ty == Type.any
-              kw_tys = { nil => Type.any }
+              raise NotImplementedError
             end
           else
-            raise NotImplementedError
+            kw_tys = {}
           end
-        else
-          kw_tys = {}
         end
         aargs = ActualArguments.new(aargs, rest_ty, kw_tys, blk_ty)
       elsif flag_args_kw_splat

data/lib/typeprof/import.rb

@@ -6,8 +6,13 @@ module TypeProf
       @repo = RBS::Repository.new
       collection_path = Config.current.collection_path
       if collection_path&.exist?
-        collection_lock = RBS::Collection::Config.lockfile_of(collection_path)
-        @repo.add(collection_lock.repo_path)
+        lock_path = RBS::Collection::Config.to_lockfile_path(collection_path)
+        if lock_path.exist?
+          collection_lock = RBS::Collection::Config.from_path(lock_path)
+          @repo.add(collection_lock.repo_path)
+        else
+          raise "Please execute 'rbs collection install'"
+        end
       end
       @env, @loaded_gems, @builtin_env_json = RBSReader.get_builtin_env
     end
@@ -23,9 +28,14 @@ module TypeProf
         # TODO: invalidate this cache when rbs_collection.yml was changed
         collection_path = Config.current.collection_path
         if collection_path&.exist?
-          collection_lock = RBS::Collection::Config.lockfile_of(collection_path)
-          collection_lock.gems.each {|gem| @loaded_gems << gem["name"] }
-          loader.add_collection(collection_lock)
+          lock_path = RBS::Collection::Config.to_lockfile_path(collection_path)
+          if lock_path.exist?
+            collection_lock = RBS::Collection::Config::Lockfile.from_lockfile(lockfile_path: lock_path, data: YAML.load_file(lock_path.to_s))
+            collection_lock.gems.each {|gem| @loaded_gems << gem["name"] }
+            loader.add_collection(collection_lock)
+          else
+            raise "Please execute 'rbs collection install'"
+          end
         end
 
         new_decls = loader.load(env: @builtin_env).map {|decl,| decl }
@@ -77,19 +87,37 @@ module TypeProf
     def load_rbs_string(name, content)
       buffer = RBS::Buffer.new(name: name, content: content)
       new_decls = []
-      RBS::Parser.parse_signature(buffer).each do |decl|
-        @env << decl
-        new_decls << decl
+      ret = RBS::Parser.parse_signature(buffer)
+      if ret[0].is_a?(RBS::Buffer)
+        # rbs 3.0
+        buffer, directives, decls = ret
+        @env.add_signature(buffer: buffer, directives: directives, decls: decls)
+        new_decls.concat(decls)
+      else
+        ret.each do |decl|
+          @env << decl
+          new_decls << decl
+        end
       end
       RBSReader.load_rbs(@env, new_decls)
     end
 
     def self.load_rbs(env, new_decls)
       all_env = env.resolve_type_names
-      resolver = RBS::TypeNameResolver.from_env(all_env)
       cur_env = RBS::Environment.new
-      new_decls.each do |decl|
-        cur_env << env.resolve_declaration(resolver, decl, outer: [], prefix: RBS::Namespace.root)
+      if defined?(RBS::TypeNameResolver)
+        resolver = RBS::TypeNameResolver.from_env(all_env)
+        new_decls.each do |decl|
+          cur_env << env.resolve_declaration(resolver, decl, outer: [], prefix: RBS::Namespace.root)
+        end
+      else
+        resolver = RBS::Resolver::TypeNameResolver.new(all_env)
+        table = RBS::Environment::UseMap::Table.new()
+        table.compute_children
+        map = RBS::Environment::UseMap.new(table: table)
+        new_decls.each do |decl|
+          cur_env << s = env.resolve_declaration(resolver, map, decl, outer: [], prefix: RBS::Namespace.root)
+        end
       end
 
       RBS2JSON.new(all_env, cur_env).dump_json
@@ -134,6 +162,9 @@ module TypeProf
       gvars
     end
 
+    AliasDecl = defined?(RBS::AST::Declarations::Alias) ? RBS::AST::Declarations::Alias : RBS::AST::Declarations::AliasDecl
+    TypeAlias = defined?(RBS::AST::Declarations::TypeAlias) ? RBS::AST::Declarations::TypeAlias : nil
+
     def conv_classes
       json = {}
 
@@ -170,7 +201,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 +216,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?
@@ -260,9 +296,10 @@ module TypeProf
 
             # The following declarations are ignoreable because they are handled in other level
             when RBS::AST::Declarations::Constant
-            when RBS::AST::Declarations::Alias # type alias
+            when AliasDecl # type alias
             when RBS::AST::Declarations::Class, RBS::AST::Declarations::Module
             when RBS::AST::Declarations::Interface
+            when TypeAlias
 
             else
               warn "Importing #{ member.class.name } is not supported yet"
@@ -487,7 +524,7 @@ module TypeProf
         else
           begin
             @alias_resolution_stack[ty.name] = true
-            alias_decl = @all_env.alias_decls[ty.name]
+            alias_decl = (@all_env.respond_to?(:alias_decls) ? @all_env.alias_decls : @all_env.type_alias_decls)[ty.name]
             alias_decl ? conv_type(alias_decl.decl.type) : [:any]
           ensure
             @alias_resolution_stack.delete(ty.name)

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/method.rb

@@ -117,6 +117,12 @@ module TypeProf
         ty = Type::Array.new(Type::Array::Elements.new([], msig.rest_ty), Type::Instance.new(Type::Builtin[:ary]))
         ty = ty.substitute(cur_subst, Config.current.options[:type_depth_limit]).remove_type_vars
         nenv, rest_ty = scratch.localize_type(ty, nenv, callee_ep, alloc_site2)
+        # TODO: handle a case where rest_start is not found
+        nenv = nenv.local_update(rest_start, rest_ty)
+      elsif rest_start
+        alloc_site2 = alloc_site.add_id(idx += 1)
+        ty = Type::Array.new(Type::Array::Elements.new([], Type.any), Type::Instance.new(Type::Builtin[:ary]))
+        nenv, rest_ty = scratch.localize_type(ty, nenv, callee_ep, alloc_site2)
         nenv = nenv.local_update(rest_start, rest_ty)
       end
       if msig.post_tys
@@ -146,6 +152,11 @@ module TypeProf
         ty = ty.substitute(cur_subst, Config.current.options[:type_depth_limit]).remove_type_vars
         nenv, ty = scratch.localize_type(ty, nenv, callee_ep, alloc_site2)
         nenv = nenv.local_update(kw_rest, ty)
+      elsif kw_rest
+        alloc_site2 = alloc_site.add_id(:**)
+        ty = Type.gen_hash {}
+        nenv, ty = scratch.localize_type(ty, nenv, callee_ep, alloc_site2)
+        nenv = nenv.local_update(kw_rest, ty)
       end
       nenv = nenv.local_update(block_start, msig.blk_ty) if block_start
 

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.7"
 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.7
 platform: ruby
 authors:
 - Yusuke Endoh
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-07-06 00:00:00.000000000 Z
+date: 2023-03-06 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.5.0.dev
+signing_key:
 specification_version: 4
 summary: TypeProf is a type analysis tool for Ruby code based on abstract interpretation
 test_files: []