steep 0.25.0 → 0.31.0

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

@@ -15,6 +15,12 @@ module Steep
             end || []
           end
         end
+
+        module NoFreeVariables
+          def free_variables()
+            @fvs ||= Set.new
+          end
+        end
       end
     end
   end

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

@@ -22,8 +22,8 @@ module Steep
           s.instance_type or raise "Unexpected substitution: #{inspect}"
         end
 
-        def free_variables
-          Set.new
+        def free_variables()
+          @fvs = Set.new([self])
         end
 
         def to_s

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

@@ -28,39 +28,46 @@ module Steep
             else
               type
             end
-          end.compact.uniq.yield_self do |tys|
-            if tys.size == 1
+          end.compact.yield_self do |tys|
+            dups = Set.new(tys)
+
+            case dups.size
+            when 0
+              AST::Types::Top.new(location: location)
+            when 1
               tys.first
             else
-              new(types: tys.sort_by(&:hash), location: location)
+              new(types: dups.to_a, location: location)
             end
           end
         end
 
         def ==(other)
-          other.is_a?(Intersection) &&
-            other.types == types
+          other.is_a?(Intersection) && other.types == types
         end
 
         def hash
-          self.class.hash ^ types.hash
+          @hash ||= self.class.hash ^ types.hash
         end
 
         alias eql? ==
 
         def subst(s)
-          self.class.build(location: location,
-                           types: types.map {|ty| ty.subst(s) })
+          self.class.build(location: location, types: types.map {|ty| ty.subst(s) })
         end
 
         def to_s
-          "(#{types.map(&:to_s).sort.join(" & ")})"
+          "(#{types.map(&:to_s).join(" & ")})"
         end
 
-        def free_variables
-          types.each.with_object(Set.new) do |type, set|
-            set.merge(type.free_variables)
-          end
+        def free_variables()
+          @fvs ||= begin
+                     set = Set.new
+                     types.each do |type|
+                       set.merge(type.free_variables)
+                     end
+                     set
+                   end
         end
 
         include Helper::ChildrenLevel

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

@@ -29,9 +29,7 @@ module Steep
           value.inspect
         end
 
-        def free_variables
-          Set.new
-        end
+        include Helper::NoFreeVariables
 
         def level
           [0]

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

@@ -0,0 +1,63 @@
+module Steep
+  module AST
+    module Types
+      module Logic
+        class Base
+          attr_reader :location
+
+          def subst(s)
+            self
+          end
+
+          def free_variables
+            @fvs ||= Set[]
+          end
+
+          def hash
+            self.class.hash
+          end
+
+          def ==(other)
+            other.class ==self.class
+          end
+
+          alias eql? ==
+
+          def to_s
+            "<% #{self.class} %>"
+          end
+        end
+
+        class Not < Base
+          def initialize(location: nil)
+            @location = location
+          end
+        end
+
+        class ReceiverIsNil < Base
+          def initialize(location: nil)
+            @location = location
+          end
+        end
+
+        class ReceiverIsNotNil < Base
+          def initialize(location: nil)
+            @location = location
+          end
+        end
+
+        class ReceiverIsArg < Base
+          def initialize(location: nil)
+            @location = location
+          end
+        end
+
+        class ArgIsReceiver < Base
+          def initialize(location: nil)
+            @location = location
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -11,9 +11,7 @@ module Steep
             @name = name
           end
 
-          def free_variables
-            Set.new
-          end
+          include Helper::NoFreeVariables
 
           def subst(s)
             self
@@ -41,7 +39,7 @@ module Steep
           alias eql? ==
 
           def hash
-            self.class.hash ^ name.hash ^ args.hash
+            @hash ||= self.class.hash ^ name.hash ^ args.hash
           end
 
           def to_s
@@ -57,14 +55,20 @@ module Steep
           end
 
           def subst(s)
-            self.class.new(location: location,
-                           name: name,
-                           args: args.map {|a| a.subst(s) })
+            if free_variables.intersect?(s.domain)
+              self.class.new(location: location,
+                             name: name,
+                             args: args.map {|a| a.subst(s) })
+            else
+              self
+            end
           end
 
           def free_variables
-            args.each.with_object(Set.new) do |type, vars|
-              vars.merge(type.free_variables)
+            @fvs ||= Set.new().tap do |set|
+              args.each do |type|
+                set.merge(type.free_variables)
+              end
             end
           end
 
@@ -75,59 +79,7 @@ module Steep
           end
         end
 
-        class Class < Base
-          attr_reader :constructor
-
-          def initialize(name:, constructor:, location: nil)
-            raise "Name should be a module name: #{name.inspect}" unless name.is_a?(Names::Module)
-            super(name: name, location: location)
-            @constructor = constructor
-          end
-
-          def ==(other)
-            other.class == self.class &&
-              other.name == name &&
-              other.constructor == constructor
-          end
-
-          alias eql? ==
-
-          def hash
-            self.class.hash ^ name.hash ^ constructor.hash
-          end
-
-          def to_s
-            k = case constructor
-                when true
-                  " constructor"
-                when false
-                  " noconstructor"
-                when nil
-                  ""
-                end
-            "singleton(#{name.to_s})"
-          end
-
-          def with_location(new_location)
-            self.class.new(name: name, constructor: constructor, location: new_location)
-          end
-
-          def to_instance(*args)
-            Instance.new(name: name, args: args)
-          end
-
-          NOTHING = ::Object.new
-
-          def updated(constructor: NOTHING)
-            if NOTHING == constructor
-              constructor = self.constructor
-            end
-
-            self.class.new(name: name, constructor: constructor, location: location)
-          end
-        end
-
-        class Module < Base
+        class Singleton < Base
           def ==(other)
             other.class == self.class &&
               other.name == name
@@ -149,12 +101,8 @@ module Steep
         end
 
         class Instance < Applying
-          def to_class(constructor:)
-            Class.new(name: name, location: location, constructor: constructor)
-          end
-
           def to_module
-            Module.new(name: name, location: location)
+            Singleton.new(name: name, location: location)
           end
         end
 

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

@@ -26,9 +26,7 @@ module Steep
           "nil"
         end
 
-        def free_variables
-          Set.new
-        end
+        include Helper::NoFreeVariables
 
         def level
           [0]

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

@@ -36,8 +36,11 @@ module Steep
           "^#{params} -> #{return_type}"
         end
 
-        def free_variables
-          params.free_variables + return_type.free_variables
+        def free_variables()
+          @fvs ||= Set.new.tap do |set|
+            set.merge(params.free_variables)
+            set.merge(return_type.free_variables)
+          end
         end
 
         def level

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

@@ -26,12 +26,17 @@ module Steep
         end
 
         def to_s
-          "{ #{elements.map {|key, value| "#{key.inspect} => #{value}" }.join(", ")} }"
+          strings = elements.keys.sort.map do |key|
+            "#{key.inspect} => #{elements[key]}"
+          end
+          "{ #{strings.join(", ")} }"
         end
 
-        def free_variables
-          elements.each_value.with_object(Set.new) do |type, set|
-            set.merge(type.free_variables)
+        def free_variables()
+          @fvs ||= Set.new.tap do |set|
+            elements.each_value do |type|
+              set.merge(type.free_variables)
+            end
           end
         end
 

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

@@ -27,7 +27,7 @@ module Steep
         end
 
         def free_variables
-          Set.new
+          @fvs ||= Set.new([self])
         end
 
         def level

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

@@ -26,9 +26,7 @@ module Steep
           "⟙"
         end
 
-        def free_variables
-          Set.new
-        end
+        include Helper::NoFreeVariables
 
         def level
           [2]

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

@@ -30,9 +30,11 @@ module Steep
           "[#{types.join(", ")}]"
         end
 
-        def free_variables
-          types.each.with_object(Set.new) do |type, set|
-            set.merge(type.free_variables)
+        def free_variables()
+          @fvs ||= Set.new.tap do |set|
+            types.each do |type|
+              set.merge(type.free_variables)
+            end
           end
         end
 

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

@@ -11,6 +11,9 @@ module Steep
         end
 
         def self.build(types:, location: nil)
+          return AST::Types::Bot.new if types.empty?
+          return types.first if types.size == 1
+
           types.flat_map do |type|
             if type.is_a?(Union)
               type.types
@@ -29,40 +32,41 @@ module Steep
               type
             end
           end.compact.uniq.yield_self do |tys|
-            case tys.length
+            case tys.size
             when 0
               AST::Types::Bot.new
             when 1
               tys.first
             else
-              new(types: tys.sort_by(&:hash), location: location)
+              new(types: tys, location: location)
             end
           end
         end
 
         def ==(other)
           other.is_a?(Union) &&
-            other.types == types
+            Set.new(other.types) == Set.new(types)
         end
 
         def hash
-          self.class.hash ^ types.hash
+          @hash ||= self.class.hash ^ types.sort_by(&:to_s).hash
         end
 
         alias eql? ==
 
         def subst(s)
-          self.class.build(location: location,
-                           types: types.map {|ty| ty.subst(s) })
+          self.class.build(location: location, types: types.map {|ty| ty.subst(s) })
         end
 
         def to_s
-          "(#{types.map(&:to_s).sort.join(" | ")})"
+          "(#{types.map(&:to_s).join(" | ")})"
         end
 
         def free_variables
-          types.each.with_object(Set.new) do |type, set|
-            set.merge(type.free_variables)
+          @fvs ||= Set.new.tap do |set|
+            types.each do |type|
+              set.merge(type.free_variables)
+            end
           end
         end
 

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

@@ -44,8 +44,8 @@ module Steep
           end
         end
 
-        def free_variables
-          Set.new([name])
+        def free_variables()
+          @fvs ||= Set.new([name])
         end
 
         def level

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

@@ -26,9 +26,7 @@ module Steep
           "void"
         end
 
-        def free_variables
-          Set.new
-        end
+        include Helper::NoFreeVariables
 
         def level
           [0]