typeprof 0.21.2 → 0.21.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9cfc98929d3481526809f92f41edd0abe30d82aaab6f1e1e95d574c74e1cee9b
-  data.tar.gz: 895a3f4949b010d2809e32016fec9e7597ae6b5e29175448b668ede33ab20b99
+  metadata.gz: c0f10007471912f793ce801817a088aa794bc4baeb15e5179362521f55e41ec0
+  data.tar.gz: ed61a2b2f4b9800cfb9c9e75d7aa0d0a5690ec1660e509dd4da456b60d1d03e7
 SHA512:
-  metadata.gz: 736ebc69c1715474973c514ca0e013991575732bee3549b7ac80865264bf3fde42065b1e00b408d3a543a8730030979e891be0427f73a297808bfd890c5698f0
-  data.tar.gz: 6bbe63293cfa70dc393e6a97d7a761865ed76a4cbb12a95a19134649079849a82510671e2d1661c55319958040f30c70f2ab06f255a28af5d0cbb6eba96ac0f0
+  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,head]
+        ruby-version: [2.7, 3.0, 3.1, 3.2, head]
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
-      with:
-        submodules: true
+    - uses: actions/checkout@v3
     - 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

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    typeprof (0.21.2)
+    typeprof (0.21.3)
       rbs (>= 1.8.1)
 
 GEM
@@ -11,14 +11,14 @@ GEM
     docile (1.4.0)
     power_assert (2.0.1)
     rake (13.0.1)
-    rbs (2.0.0)
+    rbs (2.8.3)
     simplecov (0.21.2)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
-    simplecov_json_formatter (0.1.3)
-    stackprof (0.2.17)
+    simplecov_json_formatter (0.1.4)
+    stackprof (0.2.19)
     test-unit (3.5.3)
       power_assert
 
@@ -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/block.rb

@@ -92,7 +92,7 @@ module TypeProf
       aargs = scratch.globalize_type(aargs, caller_env, caller_ep)
       subst = aargs.consistent_with_method_signature?(@msig)
       unless subst
-        scratch.warn(caller_ep, "The arguments is not compatibile to RBS block")
+        scratch.warn(caller_ep, "The arguments is not compatible to RBS block")
       end
       # check?
       #subst = { Type::Var.new(:self) => caller_env.static_env.recv_ty }

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

@@ -5,6 +5,8 @@ require "uri"
 module TypeProf
   def self.start_lsp_server(config)
     if config.lsp_options[:stdio]
+      $stdin.binmode
+      $stdout.binmode
       reader = LSP::Reader.new($stdin)
       writer = LSP::Writer.new($stdout)
       # pipe all builtin print output to stderr to avoid conflicting with lsp
@@ -498,9 +500,11 @@ module TypeProf
         when "typeprof.enableSignature"
           @server.signature_enabled = true
           @server.send_request("workspace/codeLens/refresh")
+          respond(nil)
         when "typeprof.disableSignature"
           @server.signature_enabled = false
           @server.send_request("workspace/codeLens/refresh")
+          respond(nil)
         when "typeprof.createPrototypeRBS"
           class_kind, class_name, sig_str = @params[:arguments]
           code_range =

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.2"
+  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"

data/typeprof.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
   spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
-    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(doc|test|spec|features|smoke|testbed)/}) }
+    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(doc|test|spec|features|smoke|testbed|vscode)/}) }
   end
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: typeprof
 version: !ruby/object:Gem::Version
-  version: 0.21.2
+  version: 0.21.4
 platform: ruby
 authors:
 - Yusuke Endoh
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-12-28 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
@@ -67,23 +68,13 @@ files:
 - tools/setup-insns-def.rb
 - typeprof-lsp
 - typeprof.gemspec
-- vscode/.gitignore
-- vscode/.vscode/launch.json
-- vscode/.vscodeignore
-- vscode/README.md
-- vscode/development.md
-- vscode/package-lock.json
-- vscode/package.json
-- vscode/sandbox/test.rb
-- vscode/src/extension.ts
-- vscode/tsconfig.json
 homepage: https://github.com/ruby/typeprof
 licenses:
 - MIT
 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
@@ -98,8 +89,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.0.dev
-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: []

data/vscode/.gitignore

@@ -1,5 +0,0 @@
-/out
-node_modules
-.vscode/*
-!.vscode/launch.json
-*.vsix

data/vscode/.vscode/launch.json

@@ -1,16 +0,0 @@
-{
-    "version": "0.1.0",
-    "configurations": [
-        {
-            "name": "Launch Extension",
-            "type": "extensionHost",
-            "request": "launch",
-            "runtimeExecutable": "${execPath}",
-            "args": ["--extensionDevelopmentPath=${workspaceRoot}" ],
-            "stopOnEntry": false,
-            "sourceMaps": true,
-            "outFiles": [ "${workspaceRoot}/out/src/**/*.js" ],
-            "preLaunchTask": "npm: vscode:prepublish"
-        }
-    ]
-}

data/vscode/.vscodeignore

@@ -1,7 +0,0 @@
-/sandbox
-.vscode/**
-/src
-**/*.ts
-**/*.js.map
-**/tsconfig.json
-development.md

data/vscode/README.md

@@ -1,22 +0,0 @@
-# Ruby TypeProf VSCode Integration
-
-*NOTE: This extenstion is very preliminary.*
-
-This is a VSCode extension to help you write Ruby code by using an code analyzer called [Ruby TypeProf](https://github.com/ruby/typeprof/) as a backend.
-
-## How to use this extension
-
-*TBD*
-
-Requirements:
-
-1. Use Ruby 3.1.0 or later, and TypeProf 0.20.0 or later
-2. Add `gem "typeprof"` to your `Gemfile`, and execute `bundle install`
-
-Troubleshooting:
-
-*TBD*
-
-## How to develop this extension
-
-See [development.md](https://github.com/ruby/typeprof/blob/master/development.md).

data/vscode/development.md

@@ -1,31 +0,0 @@
-# LSP client for vscode
-
-Note: this is under development
-
-## How to run
-
-```
-$ cd vscode
-$ npm install
-$ npx run tsc -p ./
-$ cd ..
-$ code --extensionDevelopmentPath=vscode/ .
-```
-
-Alternatively, you can do it in vscode itself.
-
-```
-$ cd vscode
-$ code
-```
-
-And then press F5 to run another vscode with extension.
-
-## How to release
-
-```
-$ npm run package
-$ npx vsce publish
-```
-
-See also: https://code.visualstudio.com/api/working-with-extensions/publishing-extension