steep 1.3.0.pre.2 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 639a97319d661c777702365209eaf5a6ea2632723a509331a03f6f1ef3926148
-  data.tar.gz: fb6061b52a09fb97c907abff4f69d6c9267eef1c9a3af52fa87fffda9de5d1f0
+  metadata.gz: c2625d09ae9d7a818a55ae0452268819aa8ac1b826ae174e9e70f15b7fecfabe
+  data.tar.gz: d586054591dc13c5baab2fe07641d7cf4ff3cf25ca7cd3ee8cd5002ca939b0b6
 SHA512:
-  metadata.gz: 232ec5b779c018aa9824318e003cd60e3ec3691297903337bb414fff87e757daaacfda2d94fb0c751538dcad194763ad6cb5b072156686bd450d5292d490a2e6
-  data.tar.gz: b322f5568a1fe5cbc0693a01a7be50d9860e056a9f69325e6c55a9322f2d32f7d1d0889d19e45576ca6f3f9afde9649747d9d02a0e251702f94cd27bf5fae27c
+  metadata.gz: a2fe1540caaef3ca4c2147e59dc13e4965a3b1bab7f75228ffc3a36e0763bf755e013fcb42f987de32f077bf027ebe6495eda6408e65fb980c732f60fa3edb27
+  data.tar.gz: ac8b0f6f729b9e4f6be0bd35e06b2873ab2190b4e99ba10d87a03ac685990bd7866aa9aabf80e0e38156ab2e368279753557856d2382b6379f8d97503db53052

data/.github/workflows/ruby-windows.yml

@@ -14,6 +14,7 @@ jobs:
         - "2.7"
         - "3.0"
         - "3.1"
+        - "3.2"
         task:
         - test
         # - test:output  Ignored because the order of diagnostics changes somehow

data/.github/workflows/ruby.yml

@@ -11,10 +11,10 @@ jobs:
     strategy:
       matrix:
         container_tag:
-        - "2.6"
         - "2.7"
         - "3.0"
         - "3.1"
+        - "3.2"
         - "master-nightly-focal"
         task:
         - test
@@ -25,10 +25,6 @@ jobs:
       image: rubylang/ruby:${{ matrix.container_tag }}
     steps:
     - uses: actions/checkout@v3
-    - name: Reset bundler
-      run: |
-        rm Gemfile.lock Gemfile.steep.lock
-      if: contains(matrix.container_tag, '2.6')
     - name: Run test
       run: |
         git config --global --add safe.directory /__w/steep/steep

data/CHANGELOG.md

@@ -2,6 +2,18 @@
 
 ## master
 
+## 1.3.1 (2023-03-08)
+
+### Miscellaneous
+
+* Require rbs-2.8.x ([#732](https://github.com/soutaro/steep/pull/732))
+
+## 1.3.0 (2022-11-25)
+
+### Type checker core
+
+* Type check types ([#676](https://github.com/soutaro/steep/pull/676))
+
 ## 1.3.0.pre.2 (2022-11-23)
 
 ### Type checker core

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    steep (1.3.0.pre.2)
+    steep (1.3.1)
       activesupport (>= 5.1)
       csv (>= 3.0.9)
       fileutils (>= 1.1.0)
@@ -11,8 +11,9 @@ PATH
       logger (>= 1.3.0)
       parallel (>= 1.0.0)
       parser (>= 3.1)
+      pathname (>= 0.2.1)
       rainbow (>= 2.2.2, < 4.0)
-      rbs (>= 2.8.0.pre)
+      rbs (~> 2.8.0)
       securerandom (>= 0.1)
       strscan (>= 1.0.0)
       terminal-table (>= 2, < 4)
@@ -20,51 +21,52 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.0.4)
+    activesupport (7.0.4.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
     ast (2.4.2)
-    concurrent-ruby (1.1.10)
-    csv (3.2.5)
+    concurrent-ruby (1.2.2)
+    csv (3.2.6)
     debase (0.2.5.beta2)
       debase-ruby_core_source (>= 0.10.12)
-    debase-ruby_core_source (0.10.16)
+    debase-ruby_core_source (3.2.0)
     ffi (1.15.5)
-    fileutils (1.6.0)
+    fileutils (1.7.0)
     i18n (1.12.0)
       concurrent-ruby (~> 1.0)
-    json (2.6.2)
-    language_server-protocol (3.17.0.1)
-    listen (3.7.1)
+    json (2.6.3)
+    language_server-protocol (3.17.0.3)
+    listen (3.8.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    logger (1.5.1)
+    logger (1.5.3)
     minitest (5.16.3)
     minitest-hooks (1.5.0)
       minitest (> 5.3)
     minitest-slow_test (0.2.0)
       minitest (>= 5.0)
     parallel (1.22.1)
-    parser (3.1.2.1)
+    parser (3.2.1.1)
       ast (~> 2.4.1)
+    pathname (0.2.1)
     rainbow (3.1.1)
     rake (13.0.6)
     rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rbs (2.8.0.pre.1)
+    rbs (2.8.1)
     ruby-debug-ide (0.7.3)
       rake (>= 0.8.1)
-    securerandom (0.2.0)
-    stackprof (0.2.22)
-    strscan (3.0.4)
+    securerandom (0.2.2)
+    stackprof (0.2.23)
+    strscan (3.0.6)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
-    tzinfo (2.0.5)
+    tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.3.0)
+    unicode-display_width (2.4.2)
 
 PLATFORMS
   ruby

data/Gemfile.steep

@@ -1,4 +1,3 @@
 source "https://rubygems.org"
 
-gem 'steep', '~> 1.2.0'
-gem "rbs", '~> 2.8.0.pre'
+gem 'steep', '~> 1.3.0.pre'

data/Gemfile.steep.lock

@@ -27,9 +27,9 @@ GEM
     rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rbs (2.8.0.pre.1)
+    rbs (2.8.0)
     securerandom (0.2.0)
-    steep (1.2.1)
+    steep (1.3.0.pre.2)
       activesupport (>= 5.1)
       csv (>= 3.0.9)
       fileutils (>= 1.1.0)
@@ -40,7 +40,7 @@ GEM
       parallel (>= 1.0.0)
       parser (>= 3.1)
       rainbow (>= 2.2.2, < 4.0)
-      rbs (>= 2.7.0)
+      rbs (>= 2.8.0.pre)
       securerandom (>= 0.1)
       strscan (>= 1.0.0)
       terminal-table (>= 2, < 4)
@@ -55,8 +55,7 @@ PLATFORMS
   arm64-darwin-21
 
 DEPENDENCIES
-  rbs (~> 2.8.0.pre)
-  steep (~> 1.2.0)
+  steep (~> 1.3.0.pre)
 
 BUNDLED WITH
    2.3.15

data/bin/rbs

@@ -0,0 +1,21 @@
+#!/usr/bin/env bash
+
+BINSTUB_DIR=$(cd $(dirname $0); pwd)
+GEMFILE=$(readlink -f ${BINSTUB_DIR}/../Gemfile.steep)
+COLLECTION=$(readlink -f ${BINSTUB_DIR}/../rbs_collection.steep.yaml)
+ROOT_DIR=$(readlink -f ${BINSTUB_DIR}/..)
+
+RBS="bundle exec --gemfile=${GEMFILE} rbs --collection=${COLLECTION}"
+
+if type "rbenv" > /dev/null 2>&1; then
+  RBS="rbenv exec ${RBS}"
+else
+  if type "rvm" > /dev/null 2>&1; then
+    if [ -e ${ROOT_DIR}/.ruby-version ]; then
+      RBS="rvm ${ROOT_DIR} do ${RBS}"
+    fi
+  fi
+fi
+
+exec $RBS $@
+

data/bin/setup

@@ -6,4 +6,4 @@ set -vx
 bundle install
 
 bundle install --gemfile=Gemfile.steep
-bundle exec --gemfile=Gemfile.steep rbs --collection=rbs_collection.steep.yaml collection install
+bin/rbs collection install

data/lib/steep/ast/types/class.rb

@@ -27,11 +27,17 @@ module Steep
         alias eql? ==
 
         def subst(s)
-          s.module_type or raise "Unexpected substitution: #{inspect}"
+          if s.module_type
+            s.module_type
+          else
+            self
+          end
         end
 
-        def free_variables()
-          @fvs = Set.new([self])
+        @@fvs = Set[instance]
+
+        def free_variables
+          @@fvs
         end
 
         include Helper::NoChild

data/lib/steep/ast/types/factory.rb

@@ -204,7 +204,7 @@ module Steep
           when Logic::Base
             RBS::Types::Bases::Bool.new(location: type.location)
           else
-            raise "Unexpected type given: #{type} (#{type.class})"
+            __skip__ = raise "Unexpected type given: #{type} (#{type.class})"
           end
         end
 
@@ -248,7 +248,14 @@ module Steep
           RBS::AST::TypeParam.new(
             name: type_param.name,
             variance: type_param.variance,
-            upper_bound: type_param.upper_bound&.yield_self {|u| type_1(u) },
+            upper_bound: type_param.upper_bound&.yield_self {|u|
+              case u_ = type_1(u)
+              when RBS::Types::ClassInstance, RBS::Types::ClassSingleton, RBS::Types::Interface
+                u_
+              else
+                raise "`#{u_}` cannot be type parameter upper bound"
+              end
+            },
             location: type_param.location
           ).unchecked!(type_param.unchecked)
         end

data/lib/steep/ast/types/instance.rb

@@ -23,11 +23,16 @@ module Steep
         alias eql? ==
 
         def subst(s)
-          s.instance_type or raise "Unexpected substitution: #{inspect}"
+          if s.instance_type
+            s.instance_type
+          else
+            self
+          end
         end
 
-        def free_variables()
-          @fvs = Set.new([self])
+        @@fvs = Set[instance]
+        def free_variables
+          @@fvs
         end
 
         include Helper::NoChild

data/lib/steep/ast/types/intersection.rb

@@ -35,7 +35,7 @@ module Steep
             when 0
               AST::Types::Top.new(location: location)
             when 1
-              tys.first
+              tys.first || raise
             else
               new(types: dups.to_a, location: location)
             end
@@ -73,7 +73,11 @@ module Steep
         include Helper::ChildrenLevel
 
         def each_child(&block)
-          types.each(&block)
+          if block
+            types.each(&block)
+          else
+            types.each
+          end
         end
 
         def level

data/lib/steep/ast/types/literal.rb

@@ -54,7 +54,7 @@ module Steep
                   when false
                     Builtin::FalseClass
                   else
-                    raise "Unexpected literal type: #{value.inspect}"
+                    raise "Unexpected literal type: #{(_ = value).inspect}"
                   end
 
           Name::Instance.new(name: klass.module_name, args: [], location: location)

data/lib/steep/ast/types/logic.rb

@@ -9,9 +9,7 @@ module Steep
             self
           end
 
-          def free_variables
-            @fvs ||= Set[]
-          end
+          include Helper::NoFreeVariables
 
           include Helper::NoChild
 

data/lib/steep/ast/types/name.rb

@@ -51,14 +51,16 @@ module Steep
           end
 
           def with_location(new_location)
-            self.class.new(name: name, args: args, location: new_location)
+            _ = self.class.new(name: name, args: args, location: new_location)
           end
 
           def subst(s)
             if free_variables.intersect?(s.domain)
-              self.class.new(location: location,
-                             name: name,
-                             args: args.map {|a| a.subst(s) })
+              _ = self.class.new(
+                location: location,
+                name: name,
+                args: args.map {|a| a.subst(s) }
+              )
             else
               self
             end
@@ -73,7 +75,11 @@ module Steep
           end
 
           def each_child(&block)
-            args.each(&block)
+            if block
+              args.each(&block)
+            else
+              args.each
+            end
           end
 
           include Helper::ChildrenLevel

data/lib/steep/ast/types/proc.rb

@@ -68,10 +68,6 @@ module Steep
           [0] + level_of_children(children)
         end
 
-        def closed?
-          type.closed? && (block.nil? || block.closed?) &&  (self_type ? self_type.closed? : false)
-        end
-
         def with_location(new_location)
           self.class.new(location: new_location, block: block, type: type, self_type: self_type)
         end
@@ -103,7 +99,11 @@ module Steep
         end
 
         def block_required?
-          block && !block.optional?
+          if block
+            !block.optional?
+          else
+            false
+          end
         end
 
         def each_child(&block)

data/lib/steep/ast/types/record.rb

@@ -43,7 +43,11 @@ module Steep
         include Helper::ChildrenLevel
 
         def each_child(&block)
-          elements.each_value(&block)
+          if block
+            elements.each_value(&block)
+          else
+            elements.each_value
+          end
         end
 
         def level

data/lib/steep/ast/types/self.rb

@@ -29,11 +29,17 @@ module Steep
         include Helper::NoChild
 
         def subst(s)
-          s.self_type or raise "Unexpected substitution: #{inspect}"
+          if s.self_type
+            s.self_type
+          else
+            self
+          end
         end
 
+        @@fvs = Set[instance]
+
         def free_variables
-          @fvs ||= Set.new([self])
+          @@fvs
         end
 
         def level

data/lib/steep/ast/types/tuple.rb

@@ -31,17 +31,19 @@ module Steep
         end
 
         def free_variables()
-          @fvs ||= Set.new.tap do |set|
-            types.each do |type|
-              set.merge(type.free_variables)
-            end
+          @fvs ||= each_child.with_object(Set[]) do |type, set| #$ Set[variable]
+            set.merge(type.free_variables)
           end
         end
 
         include Helper::ChildrenLevel
 
         def each_child(&block)
-          types.each(&block)
+          if block
+            types.each(&block)
+          else
+            types.each
+          end
         end
 
         def level

data/lib/steep/ast/types/union.rb

@@ -12,7 +12,9 @@ module Steep
 
         def self.build(types:, location: nil)
           return AST::Types::Bot.new if types.empty?
-          return types.first if types.size == 1
+          if types.size == 1
+            return types.first || raise
+          end
 
           types.flat_map do |type|
             if type.is_a?(Union)
@@ -36,7 +38,7 @@ module Steep
             when 0
               AST::Types::Bot.new
             when 1
-              tys.first
+              tys.first || raise
             else
               new(types: tys, location: location)
             end
@@ -49,7 +51,7 @@ module Steep
         end
 
         def hash
-          @hash ||= types.inject(self.class.hash) {|c, type| type.hash ^ c }
+          @hash ||= types.inject(self.class.hash) {|c, type| type.hash ^ c } #$ Integer
         end
 
         alias eql? ==
@@ -71,7 +73,11 @@ module Steep
         end
 
         def each_child(&block)
-          types.each(&block)
+          if block
+            types.each(&block)
+          else
+            types.each
+          end
         end
 
         include Helper::ChildrenLevel

data/lib/steep/ast/types/var.rb

@@ -22,7 +22,7 @@ module Steep
         alias eql? ==
 
         def self.fresh_name(name)
-          @mutex ||= Mutex.new
+          @mutex ||= Thread::Mutex.new
 
           @mutex.synchronize do
             @max ||= 0

data/lib/steep/interface/substitution.rb

@@ -6,7 +6,7 @@ module Steep
         attr_reader :types_size
 
         def initialize(vars_size:, types_size:)
-          @var_size = vars_size
+          @vars_size = vars_size
           @types_size = types_size
 
           super "Invalid substitution: vars.size=#{vars_size}, types.size=#{types_size}"
@@ -43,15 +43,15 @@ module Steep
         set = Set.new
 
         set.merge(dictionary.keys)
-        set << AST::Types::Instance.instance unless instance_type.is_a?(AST::Types::Instance)
-        set << AST::Types::Class.instance unless instance_type.is_a?(AST::Types::Class)
-        set << AST::Types::Instance.instance unless instance_type.is_a?(AST::Types::Self)
+        set << AST::Types::Self.instance if self_type
+        set << AST::Types::Class.instance if module_type
+        set << AST::Types::Instance.instance if instance_type
 
         set
       end
 
       def to_s
-        a = []
+        a = [] #: Array[String]
 
         dictionary.each do |x, ty|
           a << "#{x} -> #{ty}"
@@ -87,12 +87,13 @@ module Steep
         end
       end
 
-      def self.build(vars, types = nil, instance_type: AST::Types::Instance.instance, module_type: AST::Types::Class.instance, self_type: AST::Types::Self.instance)
+      def self.build(vars, types = nil, instance_type: nil, module_type: nil, self_type: nil)
         types ||= vars.map {|var| AST::Types::Var.fresh(var) }
 
         raise InvalidSubstitutionError.new(vars_size: vars.size, types_size: types.size) unless vars.size == types.size
 
-        dic = vars.zip(types).each.with_object({}) do |(var, type), d|
+        dic = vars.zip(types).each.with_object({}) do |(var, type), d| #$ Hash[Symbol, AST::Types::t]
+          type or raise
           d[var] = type
         end
 
@@ -130,9 +131,9 @@ module Steep
           end
         end
 
-        @instance_type = instance_type.subst(s)
-        @module_type = module_type.subst(s)
-        @self_type = self_type.subst(s)
+        @instance_type = instance_type.subst(s) if instance_type
+        @module_type = module_type.subst(s) if module_type
+        @self_type = self_type.subst(s) if self_type
 
         self
       end

data/lib/steep/signature/validator.rb

@@ -270,9 +270,9 @@ module Steep
                 mixin_constraints(definition, ancestors.included_modules || raise, immediate_self_types: ancestors.self_types).each do |relation, ancestor|
                   checker.check(
                     relation,
-                    self_type: AST::Types::Self.new,
-                    instance_type: AST::Types::Instance.new,
-                    class_type: AST::Types::Class.new,
+                    self_type: AST::Types::Self.instance,
+                    instance_type: AST::Types::Instance.instance,
+                    class_type: AST::Types::Class.instance,
                     constraints: Subtyping::Constraints.empty
                   ).else do
                     raise if ancestor.source.is_a?(Symbol)
@@ -314,16 +314,16 @@ module Steep
                   relation = Subtyping::Relation.new(sub_type: var_type, super_type: parent_type)
                   result1 = checker.check(
                     relation,
-                    self_type: AST::Types::Self.new,
-                    instance_type: AST::Types::Instance.new,
-                    class_type: AST::Types::Class.new,
+                    self_type: AST::Types::Self.instance,
+                    instance_type: AST::Types::Instance.instance,
+                    class_type: AST::Types::Class.instance,
                     constraints: Subtyping::Constraints.empty
                   )
                   result2 = checker.check(
                     relation.flip,
-                    self_type: AST::Types::Self.new,
-                    instance_type: AST::Types::Instance.new,
-                    class_type: AST::Types::Class.new,
+                    self_type: AST::Types::Self.instance,
+                    instance_type: AST::Types::Instance.instance,
+                    class_type: AST::Types::Class.instance,
                     constraints: Subtyping::Constraints.empty
                   )
 
@@ -362,13 +362,13 @@ module Steep
               mixin_constraints(definition, ancestors.extended_modules, immediate_self_types: ancestors.self_types).each do |relation, ancestor|
                 checker.check(
                   relation,
-                  self_type: AST::Types::Self.new,
-                  instance_type: AST::Types::Instance.new,
-                  class_type: AST::Types::Class.new,
+                  self_type: AST::Types::Self.instance ,
+                  instance_type: AST::Types::Instance.instance,
+                  class_type: AST::Types::Class.instance,
                   constraints: Subtyping::Constraints.empty
                 ).else do
                   raise if ancestor.source.is_a?(Symbol)
-                  
+
                   @errors << Diagnostic::Signature::ModuleSelfTypeError.new(
                     name: name,
                     location: ancestor.source&.location || raise,

data/lib/steep/type_inference/logic_type_interpreter.rb

@@ -390,14 +390,14 @@ module Steep
           # 4. none of the above (example: T = String, K = Integer)
 
           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, instance_type: AST::Types::Instance.new, class_type: AST::Types::Class.new).success?
+          if subtyping.check(relation, constraints: Subtyping::Constraints.empty, self_type: AST::Types::Self.instance, instance_type: AST::Types::Instance.instance, class_type: AST::Types::Class.instance).success?
             # 1 or 2. Satisfies the condition, no narrowing because `type` is already more specific than/equals to `instance_type`
             [
               [type],
               []
             ]
           else
-            if subtyping.check(relation.flip, constraints: Subtyping::Constraints.empty, self_type: AST::Types::Self.new, instance_type: AST::Types::Instance.new, class_type: AST::Types::Class.new).success?
+            if subtyping.check(relation.flip, constraints: Subtyping::Constraints.empty, self_type: AST::Types::Self.instance, instance_type: AST::Types::Instance.instance, class_type: AST::Types::Class.instance).success?
               # 3. Satisfied the condition, narrows to `instance_type`, but cannot remove it from *falsy* list
               [
                 [instance_type],

data/lib/steep/version.rb

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

data/lib/steep.rb

@@ -93,7 +93,6 @@ require "steep/type_inference/type_env_builder"
 require "steep/type_inference/logic_type_interpreter"
 require "steep/type_inference/multiple_assignment"
 require "steep/type_inference/method_call"
-require "steep/ast/types"
 
 require "steep/index/rbs_index"
 require "steep/index/signature_symbol_provider"