steep 0.47.0 → 0.49.0

data/lib/steep/type_inference/block_params.rb

@@ -29,12 +29,14 @@ module Steep
       attr_reader :optional_params
       attr_reader :rest_param
       attr_reader :trailing_params
+      attr_reader :block_param
 
-      def initialize(leading_params:, optional_params:, rest_param:, trailing_params:)
+      def initialize(leading_params:, optional_params:, rest_param:, trailing_params:, block_param:)
         @leading_params = leading_params
         @optional_params = optional_params
         @rest_param = rest_param
         @trailing_params = trailing_params
+        @block_param = block_param
       end
 
       def params
@@ -43,6 +45,7 @@ module Steep
           params.push(*optional_params)
           params.push rest_param if rest_param
           params.push(*trailing_params)
+          params.push(block_param) if block_param
         end
       end
 
@@ -51,6 +54,7 @@ module Steep
         optional_params = []
         rest_param = nil
         trailing_params = []
+        block_param = nil
 
         default_params = leading_params
 
@@ -72,6 +76,9 @@ module Steep
           when :restarg
             default_params = trailing_params
             rest_param = Param.new(var: var, type: type, value: nil, node: arg)
+          when :blockarg
+            block_param = Param.new(var: var, type: type, value: nil, node: arg)
+            break
           end
         end
 
@@ -79,7 +86,8 @@ module Steep
           leading_params: leading_params,
           optional_params: optional_params,
           rest_param: rest_param,
-          trailing_params: trailing_params
+          trailing_params: trailing_params,
+          block_param: block_param
         )
       end
 
@@ -141,7 +149,7 @@ module Steep
         )
       end
 
-      def zip(params_type)
+      def zip(params_type, block)
         if trailing_params.any?
           Steep.logger.error "Block definition with trailing required parameters are not supported yet"
         end
@@ -204,6 +212,26 @@ module Steep
               end
             end
           end
+
+          if block_param
+            if block
+              proc_type =
+                if block.optional?
+                  AST::Types::Union.build(
+                    types: [
+                      AST::Types::Proc.new(type: block.type, block: nil),
+                      AST::Builtin.nil_type
+                    ]
+                  )
+                else
+                  AST::Types::Proc.new(type: block.type, block: nil)
+                end
+
+              zip << [block_param, proc_type]
+            else
+              zip << [block_param, AST::Builtin.nil_type]
+            end
+          end
         end
       end
 

data/lib/steep/type_inference/context.rb

@@ -102,6 +102,36 @@ module Steep
         end
       end
 
+      class TypeVariableContext
+        attr_reader :table
+        attr_reader :type_params
+
+        def initialize(type_params, parent_context: nil)
+          @type_params = type_params
+
+          @table = {}
+          table.merge!(parent_context.table) if parent_context
+
+          type_params.each do |param|
+            table[param.name] = param
+          end
+        end
+
+        def [](name)
+          table[name].upper_bound
+        end
+
+        def upper_bounds
+          table.each_value.with_object({}) do |type_param, bounds|
+            bounds[type_param.name] = type_param.upper_bound
+          end
+        end
+
+        def self.empty
+          new([])
+        end
+      end
+
       attr_reader :call_context
       attr_reader :method_context
       attr_reader :block_context
@@ -110,8 +140,9 @@ module Steep
       attr_reader :self_type
       attr_reader :type_env
       attr_reader :lvar_env
+      attr_reader :variable_context
 
-      def initialize(method_context:, block_context:, break_context:, module_context:, self_type:, type_env:, lvar_env:, call_context:)
+      def initialize(method_context:, block_context:, break_context:, module_context:, self_type:, type_env:, lvar_env:, call_context:, variable_context:)
         @method_context = method_context
         @block_context = block_context
         @break_context = break_context
@@ -120,6 +151,7 @@ module Steep
         @type_env = type_env
         @lvar_env = lvar_env
         @call_context = call_context
+        @variable_context = variable_context
       end
 
       def with(method_context: self.method_context,
@@ -129,7 +161,8 @@ module Steep
                self_type: self.self_type,
                type_env: self.type_env,
                lvar_env: self.lvar_env,
-               call_context: self.call_context)
+               call_context: self.call_context,
+               variable_context: self.variable_context)
         self.class.new(
           method_context: method_context,
           block_context: block_context,
@@ -138,7 +171,8 @@ module Steep
           self_type: self_type,
           type_env: type_env,
           lvar_env: lvar_env,
-          call_context: call_context
+          call_context: call_context,
+          variable_context: variable_context
         )
       end
     end

data/lib/steep/version.rb

@@ -1,3 +1,3 @@
 module Steep
-  VERSION = "0.47.0"
+  VERSION = "0.49.0"
 end

data/lib/steep.rb

@@ -2,10 +2,10 @@ require "steep/version"
 
 require "pathname"
 require "parser/ruby30"
+require "active_support"
 require "active_support/core_ext/object/try"
 require "active_support/core_ext/string/inflections"
 require "logger"
-require "active_support/tagged_logging"
 require "rainbow"
 require "listen"
 require 'language_server-protocol'
@@ -50,16 +50,17 @@ require "steep/ast/types/factory"
 
 require "steep/range_extension"
 
+require "steep/interface/type_param"
 require "steep/interface/function"
 require "steep/interface/block"
 require "steep/interface/method_type"
 require "steep/interface/substitution"
 require "steep/interface/interface"
 
-require "steep/subtyping/check"
 require "steep/subtyping/result"
+require "steep/subtyping/check"
+require "steep/subtyping/cache"
 require "steep/subtyping/relation"
-require "steep/subtyping/trace"
 require "steep/subtyping/constraints"
 require "steep/subtyping/variable_variance"
 require "steep/subtyping/variable_occurrence"
@@ -123,7 +124,6 @@ require "steep/drivers/validate"
 require "steep/drivers/annotations"
 require "steep/drivers/watch"
 require "steep/drivers/langserver"
-require "steep/drivers/trace_printer"
 require "steep/drivers/print_project"
 require "steep/drivers/init"
 require "steep/drivers/vendor"

data/sample/lib/length.rb

@@ -0,0 +1,35 @@
+class LengthCalculator
+  def max0(x, y)
+    if x.size > y.size
+      x
+    else
+      y
+    end
+  end
+
+  def max1(x, y)
+    if x.size > y.size
+      x
+    else
+      y
+    end
+  end
+
+  def max2(x, y)
+    if x.size > y.size
+      x
+    else
+      y
+    end
+  end
+end
+
+calc = LengthCalculator.new()
+
+calc.max0("foo", "bar")
+calc.max1("foo", "bar")
+calc.max2("foo", "bar")
+
+calc.max0(true, false)
+calc.max1(true, false)
+calc.max2(true, false)

data/sample/sig/length.rbs

@@ -0,0 +1,34 @@
+# LengthCalculator shows three different method types having the same implementation.
+#
+# * It receives two objects.
+# * It calls the `#size` method of the objects, and compare the return values.
+# * It returns one of the objects which has bigger `#size` value.
+#
+class LengthCalculator
+  interface _Sized
+    def size: () -> Integer
+  end
+
+  # *Untyped* version -- all (static) type information is lost.
+  #
+  # You can pass any object, even if the object doesn't have `#size` method.
+  #
+  def max0: (untyped, untyped) -> untyped
+
+  # *Subtyping* version -- with constraints on arguments, but the return type is inaccurate.
+  #
+  # You can type check if the object has `#size` method of the expected type.
+  # However, the return type also has `_Sized` type, which drops other methods than `#size`.
+  #
+  def max1: (_Sized, _Sized) -> _Sized
+
+  # *Generics* version -- the most advanced one in Steep/RBS
+  #
+  # You can type check if the object has `#size` method of the expected type.
+  # And the return type is the one given as arguments.
+  #
+  # Note that the type system of Steep cannot ensure the given two objects have the same type.
+  # Passing `String` and `Array[String]` will infer the return type `String | Array[String]`.
+  #
+  def max2: [T < _Sized] (T, T) -> T
+end

data/smoke/diagnostics-rbs/nonregular-type-alias.rbs

@@ -0,0 +1,3 @@
+module NonregularTypeAlias
+  type t[T, S] = ^() -> t[String, Integer]
+end

data/smoke/diagnostics-rbs/recursive-type-alias.rbs

@@ -0,0 +1,3 @@
+type foo = bar
+type bar = baz
+type baz = foo

data/smoke/diagnostics-rbs/test_expectations.yml

@@ -103,6 +103,31 @@
     message: The variance of type parameter `A` is covariant, but used in incompatible
       position here
     code: RBS::InvalidVarianceAnnotation
+- file: mixin-class-error.rbs
+  diagnostics:
+  - range:
+      start:
+        line: 5
+        character: 2
+      end:
+        line: 5
+        character: 13
+    severity: ERROR
+    message: Cannot include a class `::Foo` in the definition of `::Bar`
+    code: RBS::MixinClassError
+- file: nonregular-type-alias.rbs
+  diagnostics:
+  - range:
+      start:
+        line: 2
+        character: 2
+      end:
+        line: 2
+        character: 42
+    severity: ERROR
+    message: 'Type alias ::NonregularTypeAlias::t is defined *non-regular*: ::NonregularTypeAlias::t[::String,
+      ::Integer]'
+    code: RBS::NonregularTypeAlias
 - file: recursive-alias.rbs
   diagnostics:
   - range:
@@ -151,6 +176,38 @@
     message: 'Circular inheritance/mix-in is detected: ::Baz <: ::Foo <: ::Bar <:
       ::Baz'
     code: RBS::RecursiveAncestor
+- file: recursive-type-alias.rbs
+  diagnostics:
+  - range:
+      start:
+        line: 1
+        character: 0
+      end:
+        line: 1
+        character: 14
+    severity: ERROR
+    message: 'Type aliases cannot be *directly recursive*: ::foo'
+    code: RBS::RecursiveTypeAlias
+  - range:
+      start:
+        line: 2
+        character: 0
+      end:
+        line: 2
+        character: 14
+    severity: ERROR
+    message: 'Type aliases cannot be *directly recursive*: ::bar'
+    code: RBS::RecursiveTypeAlias
+  - range:
+      start:
+        line: 3
+        character: 0
+      end:
+        line: 3
+        character: 14
+    severity: ERROR
+    message: 'Type aliases cannot be *directly recursive*: ::baz'
+    code: RBS::RecursiveTypeAlias
 - file: superclass-mismatch.rbs
   diagnostics:
   - range:
@@ -229,15 +286,3 @@
     severity: ERROR
     message: Cannot find type `ZZZ`
     code: RBS::UnknownTypeName
-- file: mixin-class-error.rbs
-  diagnostics:
-  - range:
-      start:
-        line: 5
-        character: 2
-      end:
-        line: 5
-        character: 13
-    severity: ERROR
-    message: Cannot include a class `::Foo` in the definition of `::Bar`
-    code: RBS::MixinClassError

data/smoke/tsort/a.rb

@@ -8,5 +8,5 @@ each_node = -> (&b) { g.each_key(&b) }
 # @type var each_child: ^(Integer) { (Integer) -> void } -> void
 each_child = -> (n, &b) { g[n].each(&b) }
 
-# @type var xs: Array[String]
+# @type var xs: Array[Integer]
 xs = TSort.tsort(each_node, each_child)

data/smoke/tsort/test_expectations.yml

@@ -1,63 +1 @@
----
-- file: a.rb
-  diagnostics:
-  - range:
-      start:
-        line: 7
-        character: 0
-      end:
-        line: 7
-        character: 38
-    severity: ERROR
-    message: |-
-      Cannot assign a value of type `^() -> ::Hash[::Integer, ::Array[::Integer]]` to a variable of type `^() { (::Integer) -> void } -> void`
-        ^() -> ::Hash[::Integer, ::Array[::Integer]] <: ^() { (::Integer) -> void } -> void
-    code: Ruby::IncompatibleAssignment
-  - range:
-      start:
-        line: 7
-        character: 34
-      end:
-        line: 7
-        character: 35
-    severity: ERROR
-    message: Cannot detect the type of the expression
-    code: Ruby::FallbackAny
-  - range:
-      start:
-        line: 9
-        character: 0
-      end:
-        line: 9
-        character: 41
-    severity: ERROR
-    message: |-
-      Cannot assign a value of type `^(::Integer) -> ::Enumerator[::Integer, ::Array[::Integer]]` to a variable of type `^(::Integer) { (::Integer) -> void } -> void`
-        ^(::Integer) -> ::Enumerator[::Integer, ::Array[::Integer]] <: ^(::Integer) { (::Integer) -> void } -> void
-    code: Ruby::IncompatibleAssignment
-  - range:
-      start:
-        line: 9
-        character: 37
-      end:
-        line: 9
-        character: 38
-    severity: ERROR
-    message: Cannot detect the type of the expression
-    code: Ruby::FallbackAny
-  - range:
-      start:
-        line: 12
-        character: 0
-      end:
-        line: 12
-        character: 39
-    severity: ERROR
-    message: |-
-      Cannot assign a value of type `::Array[::Integer]` to a variable of type `::Array[::String]`
-        ::Array[::Integer] <: ::Array[::String]
-          ::Integer <: ::String
-            ::Numeric <: ::String
-              ::Object <: ::String
-                ::BasicObject <: ::String
-    code: Ruby::IncompatibleAssignment
+--- []

data/steep.gemspec

@@ -33,7 +33,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "rainbow", ">= 2.2.2", "< 4.0"
   spec.add_runtime_dependency "listen", "~> 3.0"
   spec.add_runtime_dependency "language_server-protocol", ">= 3.15", "< 4.0"
-  spec.add_runtime_dependency "rbs", "~> 1.7.0"
+  spec.add_runtime_dependency "rbs", ">= 2.2.0"
   spec.add_runtime_dependency "parallel", ">= 1.0.0"
   spec.add_runtime_dependency "terminal-table", ">= 2", "< 4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: steep
 version: !ruby/object:Gem::Version
-  version: 0.47.0
+  version: 0.49.0
 platform: ruby
 authors:
 - Soutaro Matsumoto
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-11-30 00:00:00.000000000 Z
+date: 2022-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -96,16 +96,16 @@ dependencies:
   name: rbs
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 2.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: parallel
   requirement: !ruby/object:Gem::Requirement
@@ -204,7 +204,6 @@ files:
 - lib/steep/drivers/langserver.rb
 - lib/steep/drivers/print_project.rb
 - lib/steep/drivers/stats.rb
-- lib/steep/drivers/trace_printer.rb
 - lib/steep/drivers/utils/driver_helper.rb
 - lib/steep/drivers/utils/jobs_count.rb
 - lib/steep/drivers/validate.rb
@@ -219,9 +218,9 @@ files:
 - lib/steep/interface/block.rb
 - lib/steep/interface/function.rb
 - lib/steep/interface/interface.rb
-- lib/steep/interface/method.rb
 - lib/steep/interface/method_type.rb
 - lib/steep/interface/substitution.rb
+- lib/steep/interface/type_param.rb
 - lib/steep/method_name.rb
 - lib/steep/module_helper.rb
 - lib/steep/project.rb
@@ -247,11 +246,11 @@ files:
 - lib/steep/services/type_check_service.rb
 - lib/steep/signature/validator.rb
 - lib/steep/source.rb
+- lib/steep/subtyping/cache.rb
 - lib/steep/subtyping/check.rb
 - lib/steep/subtyping/constraints.rb
 - lib/steep/subtyping/relation.rb
 - lib/steep/subtyping/result.rb
-- lib/steep/subtyping/trace.rb
 - lib/steep/subtyping/variable_occurrence.rb
 - lib/steep/subtyping/variable_variance.rb
 - lib/steep/type_construction.rb
@@ -271,7 +270,9 @@ files:
 - manual/annotations.md
 - sample/Steepfile
 - sample/lib/conference.rb
+- sample/lib/length.rb
 - sample/sig/conference.rbs
+- sample/sig/length.rbs
 - smoke/alias/Steepfile
 - smoke/alias/a.rb
 - smoke/alias/a.rbs
@@ -324,8 +325,10 @@ files:
 - smoke/diagnostics-rbs/invalid-type-application.rbs
 - smoke/diagnostics-rbs/invalid_variance_annotation.rbs
 - smoke/diagnostics-rbs/mixin-class-error.rbs
+- smoke/diagnostics-rbs/nonregular-type-alias.rbs
 - smoke/diagnostics-rbs/recursive-alias.rbs
 - smoke/diagnostics-rbs/recursive-class.rbs
+- smoke/diagnostics-rbs/recursive-type-alias.rbs
 - smoke/diagnostics-rbs/superclass-mismatch.rbs
 - smoke/diagnostics-rbs/test_expectations.yml
 - smoke/diagnostics-rbs/unknown-method-alias.rbs
@@ -533,7 +536,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Gradual Typing for Ruby

data/lib/steep/drivers/trace_printer.rb

@@ -1,29 +0,0 @@
-module Steep
-  module Drivers
-    class TracePrinter
-      attr_reader :io
-
-      def initialize(io)
-        @io = io
-      end
-
-      def print(trace, level: 0)
-        trace.each.with_index do |t, i|
-          prefix = "  " * (i + level)
-          case t[0]
-          when :type
-            io.puts "#{prefix}#{t[1]} <: #{t[2]}"
-          when :method
-            io.puts "#{prefix}(#{t[3]}) #{t[1]} <: #{t[2]}"
-          when :method_type
-            io.puts "#{prefix}#{t[1]} <: #{t[2]}"
-          when :interface
-            # nop
-          else
-            Steep.logger.error { "Unexpected trace item: #{t[0]}" }
-          end
-        end
-      end
-    end
-  end
-end

data/lib/steep/interface/method.rb

@@ -1,78 +0,0 @@
-module Steep
-  module Interface
-    class Method
-      attr_reader :type_name
-      attr_reader :name
-      attr_reader :super_method
-      attr_reader :types
-      attr_reader :attributes
-
-      def initialize(type_name:, name:, types:, super_method:, attributes:)
-        @type_name = type_name
-        @name = name
-        @types = types
-        @super_method = super_method
-        @attributes = attributes
-      end
-
-      def ==(other)
-        other.is_a?(Method) &&
-          other.type_name == type_name &&
-          other.name == name &&
-          other.types == types &&
-          other.super_method == super_method &&
-          other.attributes == attributes
-      end
-
-      def private?
-        attributes.include?(:private)
-      end
-
-      def closed?
-        types.all?(&:closed?)
-      end
-
-      def subst(s)
-        self.class.new(
-          type_name: type_name,
-          name: name,
-          types: types.map {|type| type.subst(s) },
-          super_method: super_method&.subst(s),
-          attributes: attributes
-        )
-      end
-
-      def with_super(super_method)
-        self.class.new(
-          type_name: type_name,
-          name: name,
-          types: types,
-          super_method: super_method,
-          attributes: attributes
-        )
-      end
-
-      def with_types(types)
-        self.class.new(
-          type_name: type_name,
-          name: name,
-          types: types,
-          super_method: super_method,
-          attributes: attributes
-        )
-      end
-
-      def map_types
-        with_types(types.map {|type| yield type })
-      end
-
-      def include_in_chain?(method)
-        (method.type_name == type_name &&
-          method.name == name &&
-          method.types == types &&
-          method.attributes == attributes) ||
-          super_method&.include_in_chain?(method)
-      end
-    end
-  end
-end