steep 1.6.0.pre.2 → 1.6.0.pre.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7a94bcc44621f7c597278fe70c9a9f909983408b8f02fae8ba400b8193f88918
-  data.tar.gz: 32381468ac551d739b2ab84c70a5bfb0ea30265ca66ab3020f8eb3a99b53b2ba
+  metadata.gz: 89c50cdd644b4f90f2b7f5a18c262c181088eda18b116b7604f8ca4b4d17363c
+  data.tar.gz: 6191d664a4a348dfdc43559c40a75ded920b83a2b245d28d10f84c3c72f7d324
 SHA512:
-  metadata.gz: 02bb300d0a9f42ccf368a32f8b6161eb6332433b5a68d6f9e75158d52cfe9ea19b67aba437b31000817b21b009e78f46633c5b7745157f32520deb711dcdbeb8
-  data.tar.gz: 367df39a6e217e6c962d4eee1d38a0d1f8e55833190375ce3e17d2b11f2a049e9e8ce78e6fdfb14db5d69c917f4f6ff4460ffb2d50197325f8dc0433bfd4149f
+  metadata.gz: 833394273e491c154a8fd6ca60c693f1fd28f51d4dcb2f864c4d60abe4645e7dceb4d9914261d8237fb339e0c7f27a7625baedea3cd9ac1680d0d32a98b2867c
+  data.tar.gz: 827261fdcffe5a0d3b32ee5771bbc6577a7a9b71a0aa2f25f3cff5eb1c6a2817e592a56f6c7189d8a028a686b7a1d8e24b313e919427c253f372de3316ed6353

data/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 ## master
 
+## 1.6.0.pre.3 (2023-11-01)
+
+### Type checker core
+
+* Object methods are moved to Kernel ([#952](https://github.com/soutaro/steep/pull/952))
+* Check if `rescue` body has `bot` type ([#953](https://github.com/soutaro/steep/pull/953))
+
 ## 1.6.0.pre.2 (2023-10-31)
 
 ### Type checker core

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    steep (1.6.0.pre.2)
+    steep (1.6.0.pre.3)
       activesupport (>= 5.1)
       concurrent-ruby (>= 1.1.10)
       csv (>= 3.0.9)

data/lib/steep/interface/builder.rb

@@ -1,4 +1,3 @@
-
 module Steep
   module Interface
     class Builder
@@ -718,22 +717,30 @@ module Steep
         if member.is_a?(RBS::AST::Members::MethodDefinition)
           case method_name.method_name
           when :is_a?, :kind_of?, :instance_of?
-            if defined_in == RBS::BuiltinNames::Object.name && member.instance?
-              return method_type.with(
-                type: method_type.type.with(
-                  return_type: AST::Types::Logic::ReceiverIsArg.new(location: method_type.type.return_type.location)
+            case
+            when RBS::BuiltinNames::Object.name,
+              RBS::BuiltinNames::Kernel.name
+              if member.instance?
+                return method_type.with(
+                  type: method_type.type.with(
+                    return_type: AST::Types::Logic::ReceiverIsArg.new(location: method_type.type.return_type.location)
+                  )
                 )
-              )
+              end
             end
 
           when :nil?
             case defined_in
-            when RBS::BuiltinNames::Object.name, AST::Builtin::NilClass.module_name
-              return method_type.with(
-                type: method_type.type.with(
-                  return_type: AST::Types::Logic::ReceiverIsNil.new(location: method_type.type.return_type.location)
+            when RBS::BuiltinNames::Object.name,
+              AST::Builtin::NilClass.module_name,
+              RBS::BuiltinNames::Kernel.name
+              if member.instance?
+                return method_type.with(
+                  type: method_type.type.with(
+                    return_type: AST::Types::Logic::ReceiverIsNil.new(location: method_type.type.return_type.location)
+                  )
                 )
-              )
+            end
             end
 
           when :!
@@ -757,8 +764,14 @@ module Steep
                   return_type: AST::Types::Logic::ArgIsReceiver.new(location: method_type.type.return_type.location)
                 )
               )
-            when RBS::BuiltinNames::Object.name, RBS::BuiltinNames::String.name, RBS::BuiltinNames::Integer.name, RBS::BuiltinNames::Symbol.name,
-              RBS::BuiltinNames::TrueClass.name, RBS::BuiltinNames::FalseClass.name, TypeName("::NilClass")
+            when RBS::BuiltinNames::Object.name,
+              RBS::BuiltinNames::Kernel.name,
+              RBS::BuiltinNames::String.name,
+              RBS::BuiltinNames::Integer.name,
+              RBS::BuiltinNames::Symbol.name,
+              RBS::BuiltinNames::TrueClass.name,
+              RBS::BuiltinNames::FalseClass.name,
+              TypeName("::NilClass")
               # Value based type-case works on literal types which is available for String, Integer, Symbol, TrueClass, FalseClass, and NilClass
               return method_type.with(
                 type: method_type.type.with(
@@ -783,3 +796,4 @@ module Steep
     end
   end
 end
+

data/lib/steep/type_construction.rb

@@ -2214,6 +2214,10 @@ module Steep
               end
             end
 
+            resbody_pairs.select! do |pair|
+              no_subtyping?(sub_type: pair.type, super_type: AST::Types::Bot.new)
+            end
+
             resbody_types = resbody_pairs.map(&:type)
             resbody_envs = resbody_pairs.map {|pair| pair.context.type_env }
 
@@ -2225,8 +2229,13 @@ module Steep
                 .update_type_env {|env| env.join(*resbody_envs, env) }
                 .add_typing(node, type: union_type(else_type, *resbody_types))
             else
-              update_type_env {|env| env.join(*resbody_envs, else_constr.context.type_env) }
-                .add_typing(node, type: union_type(*[body_pair&.type, *resbody_types].compact))
+              if resbody_types.empty?
+                constr = body_pair ? body_pair.constr : self
+                constr.add_typing(node, type: body_pair&.type || AST::Builtin.nil_type)
+              else
+                update_type_env {|env| env.join(*resbody_envs, else_constr.context.type_env) }
+                  .add_typing(node, type: union_type(*[body_pair&.type, *resbody_types].compact))
+              end
             end
           end
 

data/lib/steep/version.rb

@@ -1,3 +1,3 @@
 module Steep
-  VERSION = "1.6.0.pre.2"
+  VERSION = "1.6.0.pre.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: steep
 version: !ruby/object:Gem::Version
-  version: 1.6.0.pre.2
+  version: 1.6.0.pre.3
 platform: ruby
 authors:
 - Soutaro Matsumoto
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-10-31 00:00:00.000000000 Z
+date: 2023-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser