steep 1.3.0.pre.2 → 1.3.1

data/sig/steep/ast/types/var.rbs

@@ -1,36 +1,41 @@
 module Steep
   module AST
     module Types
+      # Type variables
       class Var
-        attr_reader name: untyped
+        attr_reader name: Symbol
 
         attr_reader location: untyped
 
-        def initialize: (name: untyped, ?location: untyped?) -> void
+        def initialize: (name: Symbol, ?location: untyped?) -> void
 
-        def ==: (untyped other) -> untyped
+        def ==: (untyped other) -> bool
 
-        def hash: () -> untyped
+        def hash: () -> Integer
 
         alias eql? ==
 
-        def self.fresh_name: (untyped name) -> untyped
+        self.@mutex: Thread::Mutex
+        self.@max: Integer
+
+        def self.fresh_name: (Symbol name) -> Symbol
 
         def self.fresh: (Symbol name, ?location: untyped?) -> Var
 
-        def to_s: () -> untyped
+        def to_s: () -> String
 
-        def subst: (untyped s) -> (untyped | self)
+        def subst: (Interface::Substitution s) -> t
 
-        def free_variables: () -> untyped
+        @fvs: Set[variable]
+        def free_variables: () -> Set[variable]
 
         include Helper::NoChild
 
         def level: () -> Array[Integer]
-                 
-        def update: (?name: untyped, ?location: untyped) -> untyped
 
-        def with_location: (untyped new_location) -> untyped
+        def update: (?name: Symbol, ?location: untyped) -> Var
+
+        def with_location: (untyped new_location) -> Var
       end
     end
   end

data/sig/steep/ast/types/void.rbs

@@ -6,15 +6,15 @@ module Steep
 
         def initialize: (?location: untyped?) -> void
 
-        def ==: (untyped other) -> untyped
+        def ==: (untyped other) -> bool
 
-        def hash: () -> untyped
+        def hash: () -> Integer
 
         alias eql? ==
 
-        def subst: (untyped s) -> self
+        def subst: (Interface::Substitution s) -> Void
 
-        def to_s: () -> "void"
+        def to_s: () -> String
 
         include Helper::NoFreeVariables
 
@@ -22,7 +22,7 @@ module Steep
 
         def level: () -> Array[Integer]
 
-        def with_location: (untyped new_location) -> untyped
+        def with_location: (untyped new_location) -> Void
       end
     end
   end

data/sig/steep/ast/types.rbs

@@ -5,33 +5,12 @@ module Steep
            | Class | Instance | Self
            | Intersection  | Record | Tuple | Union
            | Name::Alias | Name::Instance | Name::Interface | Name::Singleton
-           | Proc | Var | Logic::Base
+           | Proc | Var
+           | Logic::Not | Logic::ReceiverIsNil | Logic::ReceiverIsNotNil | Logic::ReceiverIsArg | Logic::ArgIsReceiver | Logic::ArgEqualsReceiver | Logic::Env
 
-      class Masked
-        attr_reader location: untyped
-
-        attr_reader type: untyped
-
-        attr_reader mask: untyped
-
-        def initialize: (type: untyped, mask: untyped, location: untyped) -> void
-
-        def ==: (untyped other) -> untyped
-
-        alias eql? ==
-
-        def hash: () -> untyped
-
-        def to_json: (*untyped a) -> untyped
-
-        def to_s: (?::Integer level) -> ::String
-
-        def free_variables: () -> untyped
-
-        def each_type: () { (untyped) -> untyped } -> untyped
-
-        def sub: (untyped s) -> untyped
-      end
+      # Variables and special types that is subject for substitution
+      #
+      type variable = Symbol | Class | Instance | Self
     end
   end
 end

data/sig/steep/interface/substitution.rbs

@@ -2,28 +2,28 @@ module Steep
   module Interface
     class Substitution
       class InvalidSubstitutionError < StandardError
-        attr_reader vars_size: untyped
+        attr_reader vars_size: Integer
 
-        attr_reader types_size: untyped
+        attr_reader types_size: Integer
 
-        def initialize: (vars_size: untyped, types_size: untyped) -> void
+        def initialize: (vars_size: Integer, types_size: Integer) -> void
       end
 
       attr_reader dictionary: Hash[Symbol, AST::Types::t]
 
-      attr_reader instance_type: AST::Types::t
+      attr_reader instance_type: AST::Types::t?
 
-      attr_reader module_type: AST::Types::t
+      attr_reader module_type: AST::Types::t?
 
-      attr_reader self_type: AST::Types::t
+      attr_reader self_type: AST::Types::t?
 
-      def initialize: (dictionary: Hash[Symbol, AST::Types::t], instance_type: AST::Types::t, module_type: AST::Types::t, self_type: AST::Types::t) -> void
+      def initialize: (dictionary: Hash[Symbol, AST::Types::t], instance_type: AST::Types::t?, module_type: AST::Types::t?, self_type: AST::Types::t?) -> void
 
       def self.empty: () -> instance
 
       def empty?: () -> bool
 
-      def domain: () -> Set[AST::Types::t | Symbol]
+      def domain: () -> Set[AST::Types::variable]
 
       def to_s: () -> ::String
 
@@ -31,7 +31,7 @@ module Steep
 
       def key?: (Symbol var) -> bool
 
-      def self.build: (Array[Symbol] vars, ?Array[AST::Types::t]? types, ?instance_type: AST::Types::t, ?module_type: AST::Types::t, ?self_type: AST::Types::t) -> Substitution
+      def self.build: (Array[Symbol] vars, ?Array[AST::Types::t]? types, ?instance_type: AST::Types::t?, ?module_type: AST::Types::t?, ?self_type: AST::Types::t?) -> Substitution
 
       def except: (Array[Symbol] vars) -> Substitution
 

data/steep.gemspec

@@ -26,14 +26,14 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = '>= 2.6.0'
+  spec.required_ruby_version = '>= 2.7.0'
 
   spec.add_runtime_dependency "parser", ">= 3.1"
   spec.add_runtime_dependency "activesupport", ">= 5.1"
   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", ">= 2.8.0.pre"
+  spec.add_runtime_dependency "rbs", "~> 2.8.0"
   spec.add_runtime_dependency "parallel", ">= 1.0.0"
   spec.add_runtime_dependency "terminal-table", ">= 2", "< 4"
   spec.add_runtime_dependency "securerandom", ">= 0.1"
@@ -42,4 +42,5 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "fileutils", ">= 1.1.0"
   spec.add_runtime_dependency "strscan", ">= 1.0.0"
   spec.add_runtime_dependency "csv", ">= 3.0.9"
+  spec.add_runtime_dependency "pathname", ">= 0.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: steep
 version: !ruby/object:Gem::Version
-  version: 1.3.0.pre.2
+  version: 1.3.1
 platform: ruby
 authors:
 - Soutaro Matsumoto
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-11-23 00:00:00.000000000 Z
+date: 2023-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: 2.8.0.pre
+        version: 2.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.8.0.pre
+        version: 2.8.0
 - !ruby/object:Gem::Dependency
   name: parallel
   requirement: !ruby/object:Gem::Requirement
@@ -224,6 +224,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.9
+- !ruby/object:Gem::Dependency
+  name: pathname
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.1
 description: Gradual Typing for Ruby
 email:
 - matsumoto@soutaro.com
@@ -249,6 +263,7 @@ files:
 - bin/console
 - bin/output_rebaseline.rb
 - bin/output_test.rb
+- bin/rbs
 - bin/setup
 - bin/steep
 - bin/steep-prof
@@ -261,7 +276,6 @@ files:
 - lib/steep/ast/node/type_application.rb
 - lib/steep/ast/node/type_assertion.rb
 - lib/steep/ast/type_params.rb
-- lib/steep/ast/types.rb
 - lib/steep/ast/types/any.rb
 - lib/steep/ast/types/boolean.rb
 - lib/steep/ast/types/bot.rb
@@ -761,14 +775,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.6
 signing_key:
 specification_version: 4
 summary: Gradual Typing for Ruby

data/lib/steep/ast/types.rb

@@ -1,62 +0,0 @@
-module Steep
-  module AST
-    module Types
-      class Masked
-        attr_reader :location
-        attr_reader :type
-        attr_reader :mask
-
-        def initialize(type:, mask:, location:)
-          @type = type
-          @mask = mask
-          @location = location
-        end
-
-        def ==(other)
-          other.is_a?(Masked) &&
-            other.type == type &&
-            other.mask == mask
-        end
-
-        alias eql? ==
-
-        def hash
-          self.class.hash ^ type.hash ^ mask.hash
-        end
-
-        def to_json(*a)
-          { class: :masked,
-            type: type,
-            mask: mask,
-            location: location }.to_json(*a)
-        end
-
-        def to_s(level = 0)
-          "masked(#{type}|#{mask})"
-        end
-
-        def free_variables
-          @fvs ||= Set.new.tap do |set|
-            set.merge(type.free_variables)
-            set.merge(mask.free_variables)
-          end
-        end
-
-        def each_type(&block)
-          if block_given?
-            yield type
-            yield mask
-          else
-            enum_for :each_type
-          end
-        end
-
-        def sub(s)
-          self.class.new(type: type.sub(s),
-                         mask: mask.sub(s),
-                         location: location)
-        end
-      end
-    end
-  end
-end