steep 0.23.0 → 0.29.0

data/lib/steep/type_inference/block_params.rb

@@ -56,6 +56,11 @@ module Steep
 
         node.children.each do |arg|
           var = arg.children.first
+
+          if var.is_a?(::AST::Node)
+            return
+          end
+
           type = annotations.var_type(lvar: var.name)
 
           case arg.type

data/lib/steep/type_inference/constant_env.rb

@@ -6,7 +6,7 @@ module Steep
       attr_reader :factory
       attr_reader :table
 
-      # ConstantEnv receives an Names::Module as a context, not a Namespace, because this is a simulation of Ruby.
+      # ConstantEnv receives an TypeName as a context, not a Namespace, because this is a simulation of Ruby.
       # Any namespace is a module or class.
       def initialize(factory:, context:)
         @cache = {}
@@ -17,16 +17,13 @@ module Steep
 
       def lookup(name)
         cache[name] ||= begin
-          constant = table.resolve_constant_reference(
-            factory.type_name_1(name),
-            context: context.map {|namespace| factory.namespace_1(namespace) }
-          )
+          constant = table.resolve_constant_reference(name, context: context)
 
           if constant
             factory.type(constant.type)
           end
         rescue => exn
-          Steep.logger.error "Looking up a constant failed: name=#{name}, context=[#{context.join(", ")}], error=#{exn.inspect}"
+          Steep.logger.debug "Looking up a constant failed: name=#{name}, context=[#{context.join(", ")}], error=#{exn.inspect}"
           nil
         end
       end

data/lib/steep/type_inference/context.rb

@@ -70,6 +70,14 @@ module Steep
         def const_context
           const_env.context
         end
+
+        def class_variables
+          if module_definition
+            @class_variables ||= module_definition.class_variables.transform_values do |var_def|
+              var_def.type
+            end
+          end
+        end
       end
 
       attr_reader :method_context

data/lib/steep/type_inference/context_array.rb

@@ -35,12 +35,13 @@ module Steep
 
       def insert_context(range, context:, entry: self.root)
         entry.sub_entries.each do |sub|
-          next if sub.range.begin < range.begin && range.end <= sub.range.end
-          next if range.begin < sub.range.begin && sub.range.end <= range.end
+          next if sub.range.begin <= range.begin && range.end <= sub.range.end
+          next if range.begin <= sub.range.begin && sub.range.end <= range.end
           next if range.end <= sub.range.begin
           next if sub.range.end <= range.begin
 
-          raise "Range crossing: sub range=#{sub.range}, new range=#{range}"
+          Steep.logger.error { "Range crossing: sub range=#{sub.range}, new range=#{range}" }
+          raise
         end
 
         sup = entry.sub_entries.find do |sub|

data/lib/steep/type_inference/logic.rb

@@ -47,6 +47,37 @@ module Steep
             f.merge([node])
           ]
 
+        when :masgn
+          lhs, rhs = node.children
+
+          lt, lf = nodes(node: lhs)
+          rt, rf = nodes(node: rhs)
+
+          [
+            (lt + rt).merge([node]),
+            (lf + rf).merge([node])
+          ]
+
+        when :mlhs
+          nodes = [node]
+
+          node.children.each do |child|
+            case child.type
+            when :lvasgn
+              nodes << child
+            when :splat
+              if node.children[0].type == :lvasgn
+                nodes << child
+                nodes << child.children[0]
+              end
+            end
+          end
+
+          [
+            Result.new(nodes),
+            Result.new(nodes)
+          ]
+
         when :and
           lhs, rhs = node.children
 

data/lib/steep/type_inference/logic_type_interpreter.rb

@@ -0,0 +1,219 @@
+module Steep
+  module TypeInference
+    class LogicTypeInterpreter
+      attr_reader :subtyping
+      attr_reader :typing
+
+      def initialize(subtyping:, typing:)
+        @subtyping = subtyping
+        @typing = typing
+      end
+
+      def factory
+        subtyping.factory
+      end
+
+      def guess_type_from_method(node)
+        if node.type == :send
+          method = node.children[1]
+          case method
+          when :is_a?, :kind_of?, :instance_of?
+            AST::Types::Logic::ReceiverIsArg.new
+          when :nil?
+            AST::Types::Logic::ReceiverIsNil.new
+          when :!
+            AST::Types::Logic::Not.new
+          when :===
+            AST::Types::Logic::ArgIsReceiver.new
+          end
+        end
+      end
+
+      def eval(env:, type:, node:)
+        value_node, vars = decompose_value(node)
+
+        truthy_env = env
+        falsy_env = env
+
+        if type.is_a?(AST::Types::Any)
+          type = guess_type_from_method(node) || type
+        end
+
+        if type.is_a?(AST::Types::Logic::Base)
+          vars.each do |var_name|
+            truthy_env = truthy_env.assign!(var_name, node: node, type: AST::Builtin.true_type)
+            falsy_env = truthy_env.assign!(var_name, node: node, type: AST::Builtin.false_type)
+          end
+
+          case type
+          when AST::Types::Logic::ReceiverIsNil
+            case value_node.type
+            when :send
+              receiver = value_node.children[0]
+
+              if receiver
+                _, receiver_vars = decompose_value(receiver)
+
+                receiver_vars.each do |receiver_var|
+                  var_type = env[receiver_var]
+                  truthy_type, falsy_type = factory.unwrap_optional(var_type)
+
+                  truthy_env = truthy_env.assign!(receiver_var, node: node, type: falsy_type || AST::Builtin.nil_type)
+                  falsy_env = falsy_env.assign!(receiver_var, node: node, type: truthy_type)
+                end
+              end
+            end
+          when AST::Types::Logic::ReceiverIsArg
+            case value_node.type
+            when :send
+              receiver, _, arg = value_node.children
+
+              if receiver
+                _, receiver_vars = decompose_value(receiver)
+                arg_type = typing.type_of(node: arg)
+
+                if arg_type.is_a?(AST::Types::Name::Singleton)
+                  receiver_vars.each do |var_name|
+                    var_type = env[var_name]
+                    truthy_type, falsy_type = type_case_select(var_type, arg_type.name)
+
+                    truthy_env = truthy_env.assign!(var_name, node: node, type: truthy_type)
+                    falsy_env = falsy_env.assign!(var_name, node: node, type: falsy_type)
+                  end
+                end
+              end
+            end
+          when AST::Types::Logic::ArgIsReceiver
+            case value_node.type
+            when :send
+              receiver, _, arg = value_node.children
+
+              if receiver
+                _, arg_vars = decompose_value(arg)
+                receiver_type = typing.type_of(node: receiver)
+
+                if receiver_type.is_a?(AST::Types::Name::Singleton)
+                  arg_vars.each do |var_name|
+                    var_type = env[var_name]
+                    truthy_type, falsy_type = type_case_select(var_type, receiver_type.name)
+
+                    truthy_env = truthy_env.assign!(var_name, node: node, type: truthy_type)
+                    falsy_env = falsy_env.assign!(var_name, node: node, type: falsy_type)
+                  end
+                end
+              end
+            end
+          when AST::Types::Logic::Not
+            receiver, * = value_node.children
+            receiver_type = typing.type_of(node: receiver)
+            falsy_env, truthy_env = eval(env: env, type: receiver_type, node: receiver)
+          end
+        else
+          _, vars = decompose_value(node)
+
+          vars.each do |var_name|
+            var_type = env[var_name]
+            truthy_type, falsy_type = factory.unwrap_optional(var_type)
+
+            if falsy_type
+              truthy_env = truthy_env.assign!(var_name, node: node, type: truthy_type)
+              falsy_env = falsy_env.assign!(var_name, node: node, type: falsy_type)
+            else
+              truthy_env = truthy_env.assign!(var_name, node: node, type: truthy_type)
+              falsy_env = falsy_env.assign!(var_name, node: node, type: truthy_type)
+            end
+          end
+        end
+
+        [truthy_env, falsy_env]
+      end
+
+      def decompose_value(node)
+        case node.type
+        when :lvar
+          [node, Set[node.children[0].name]]
+        when :masgn
+          lhs, rhs = node.children
+          lhs_vars = lhs.children.select {|m| m.type == :lvasgn }.map {|m| m.children[0].name }
+          val, vars = decompose_value(rhs)
+          [val, vars + lhs_vars]
+        when :lvasgn
+          var, rhs = node.children
+          val, vars = decompose_value(rhs)
+          [val, vars + [var.name]]
+        when :begin
+          decompose_value(node.children.last)
+        when :and
+          left, right = node.children
+          _, left_vars = decompose_value(left)
+          val, right_vars = decompose_value(right)
+          [val, left_vars + right_vars]
+        else
+          [node, Set[]]
+        end
+      end
+
+      def type_case_select(type, klass)
+        truth_types, false_types = type_case_select0(type, klass)
+
+        [
+          AST::Types::Union.build(types: truth_types),
+          AST::Types::Union.build(types: false_types)
+        ]
+      end
+
+      def type_case_select0(type, klass)
+        instance_type = factory.instance_type(klass)
+
+        case type
+        when AST::Types::Union
+          truthy_types = []
+          falsy_types = []
+
+          type.types.each do |ty|
+            truths, falses = type_case_select0(ty, klass)
+
+            if truths.empty?
+              falsy_types.push(ty)
+            else
+              truthy_types.push(*truths)
+              falsy_types.push(*falses)
+            end
+          end
+
+          [truthy_types, falsy_types]
+
+        when AST::Types::Name::Instance
+          relation = Subtyping::Relation.new(sub_type: type, super_type: instance_type)
+          if subtyping.check(relation, constraints: Subtyping::Constraints.empty, self_type: AST::Types::Self.new).success?
+            [
+              [type],
+              []
+            ]
+          else
+            [
+              [],
+              [type]
+            ]
+          end
+
+        when AST::Types::Name::Alias
+          ty = factory.expand_alias(type)
+          type_case_select0(ty, klass)
+
+        when AST::Types::Any, AST::Types::Top
+          [
+            [instance_type],
+            [type]
+          ]
+
+        else
+          [
+            [],
+            [type]
+          ]
+        end
+      end
+    end
+  end
+end

data/lib/steep/type_inference/type_env.rb

@@ -57,7 +57,7 @@ module Steep
         end
       end
 
-      # @type method assert: (const: Names::Module) { () -> void } -> AST::Type
+      # @type method assert: (const: TypeName) { () -> void } -> AST::Type
       #                    | (gvar: Symbol) { () -> void } -> AST::Type
       #                    | (ivar: Symbol) { () -> void } -> AST::Type
       def get(const: nil, gvar: nil, ivar: nil)
@@ -98,7 +98,7 @@ module Steep
         end
       end
 
-      # @type method assign: (const: Names::Module, type: AST::Type) { (Subtyping::Result::Failure | nil) -> void } -> AST::Type
+      # @type method assign: (const: TypeName, type: AST::Type) { (Subtyping::Result::Failure | nil) -> void } -> AST::Type
       #                    | (gvar: Symbol, type: AST::Type) { (Subtyping::Result::Failure | nil) -> void } -> AST::Type
       #                    | (ivar: Symbol, type: AST::Type) { (Subtyping::Result::Failure | nil) -> void } -> AST::Type
       def assign(const: nil, gvar: nil, ivar: nil, type:, self_type:, &block)

data/lib/steep/typing.rb

@@ -126,6 +126,13 @@ module Steep
         end_pos = node.loc.end.begin_pos
         add_context(begin_pos..end_pos, context: context)
 
+      when :for
+        _, collection, _ = node.children
+
+        begin_pos = collection.loc.expression.end_pos
+        end_pos = node.loc.end.begin_pos
+
+        add_context(begin_pos..end_pos, context: context)
       else
         raise "Unexpected node for insert_context: #{node.type}"
       end

data/lib/steep/version.rb

@@ -1,3 +1,3 @@
 module Steep
-  VERSION = "0.23.0"
+  VERSION = "0.29.0"
 end

data/smoke/alias/a.rb

@@ -1,7 +1,7 @@
 # @type var x: foo
 x = ""
 
-# !expects ArgumentTypeMismatch: receiver=(::Integer | ::String), expected=::string, actual=::Integer
+# !expects* UnresolvedOverloading: receiver=(::String | ::Integer), method_name=+,
 x + 123
 
 # @type var y: bar

data/smoke/case/a.rb

@@ -1,6 +1,6 @@
 # @type var a: Integer
 
-# !expects IncompatibleAssignment: lhs_type=::Integer, rhs_type=(::Array[::String] | ::Integer | ::String | nil)
+# !expects IncompatibleAssignment: lhs_type=::Integer, rhs_type=(::Integer | ::Array[::String] | nil | ::String)
 a = case 1
     when 2
       1

data/smoke/hash/d.rb

@@ -2,5 +2,5 @@
 
 params = { id: 30, name: "Matz" }
 
-# !expects IncompatibleAssignment: lhs_type={ :name => ::String, :id => ::Integer }, rhs_type={ :id => ::String, :name => ::String, :email => ::String }
+# !expects IncompatibleAssignment: lhs_type={ :id => ::Integer, :name => ::String }, rhs_type={ :email => ::String, :id => ::String, :name => ::String }
 params = { id: "30", name: "foo", email: "matsumoto@soutaro.com" }

data/smoke/if/a.rb

@@ -13,7 +13,7 @@ else
   "baz"
 end
 
-# !expects IncompatibleAssignment: lhs_type=::String, rhs_type=(::Integer | ::String)
+# !expects IncompatibleAssignment: lhs_type=::String, rhs_type=(::String | ::Integer)
 a = if z
       "foofoo"
     else

data/smoke/module/a.rb

@@ -13,7 +13,7 @@ module A
     # !expects IncompatibleAssignment: lhs_type=::String, rhs_type=::Integer
     s = n
 
-    # !expects NoMethodError: type=(::A & ::Object & ::_Each2[::Integer, ::A]), method=foo
+    # !expects NoMethodError: type=(::Object & ::_Each2[::Integer, ::A] & ::A), method=foo
     foo()
 
     n

data/smoke/rescue/a.rb

@@ -1,6 +1,6 @@
 # @type var a: Integer
 
-# !expects IncompatibleAssignment: lhs_type=::Integer, rhs_type=(::Integer | ::String)
+# !expects IncompatibleAssignment: lhs_type=::Integer, rhs_type=(::String | ::Integer)
 a = begin
       'foo'
     rescue
@@ -9,12 +9,12 @@ a = begin
 
 # @type var b: Integer
 
-# !expects IncompatibleAssignment: lhs_type=::Integer, rhs_type=(::Integer | ::String)
+# !expects IncompatibleAssignment: lhs_type=::Integer, rhs_type=(::String | ::Integer)
 b = 'foo' rescue 1
 
 # @type var c: Integer
 
-# !expects IncompatibleAssignment: lhs_type=::Integer, rhs_type=(::Integer | ::String | ::Symbol)
+# !expects IncompatibleAssignment: lhs_type=::Integer, rhs_type=(::String | ::Symbol | ::Integer)
 c = begin
       'foo'
     rescue RuntimeError
@@ -23,18 +23,9 @@ c = begin
       1
     end
 
-# @type var d: Integer
-
-# !expects IncompatibleAssignment: lhs_type=::Integer, rhs_type=::String
-d = begin
-      1
-    else
-      'foo'
-    end
-
 # @type var e: Integer
 
-# !expects IncompatibleAssignment: lhs_type=::Integer, rhs_type=(::Array[::Integer] | ::Integer | ::Symbol)
+# !expects IncompatibleAssignment: lhs_type=::Integer, rhs_type=(::Array[::Integer] | ::Symbol | ::Integer)
 e = begin
       'foo'
     rescue RuntimeError