steep 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 123376eb779b7118cfc9fb097cbd2bd028c4ce154526d5c79339902b170ad2c3
-  data.tar.gz: b6b4c6e49b3f998103582a7c416a5f3603cb9204ab672b2c4b4f911eebc8adcb
+  metadata.gz: 376c287eb4edd3b191575c4dae0d6f928394ba2a52ee41ed6245c4b73579d3f0
+  data.tar.gz: ef83cd047a6f35f597e3709f45ee3918c0bad4944c970002827baf2ea012df76
 SHA512:
-  metadata.gz: 0f5df26d1601a390adba84efabadd1a6947c601df83ab48fb538dea000b1cc05bb26dffd894f2c7c8c198c2c63e54972e695390de21b9580249b283e6a54d3d4
-  data.tar.gz: c8e99c6e9247fbec030279f02891ba2aa6d2b217b7c8a61f9decc0afa308841245088785e21590858cc5e73f79827cf1515f4e9fa399ffcab18637e6851ac292
+  metadata.gz: 6f350dd1d6043f7389bb97ec1c6526fbc7a62aa86a9fb3b4b4f1c01241d6bd691c9fe51a5e91a242900e4c9528cc50d2ed5638b5b70e6e21645088bd6f85fffc
+  data.tar.gz: 3df8d10e17edeb6cad99199370f21925681f81cfebf29a471cee4087edb5a1efd13580dae0c9ddc46e2f64b3a6314d18b0a72f0299a42dd597134512fa32593f

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ## master
 
+## 0.4.0 (2018-06-14)
+
+* Add *tuple* type (#40)
+* Add `bool` and `nil` types (#39)
+* Add *literal type* (#37)
+
 ## 0.3.0 (2018-05-31)
 
 * Add `interface` command to print interface built for given type

data/lib/steep.rb

@@ -21,6 +21,10 @@ require "steep/ast/types/intersection"
 require "steep/ast/types/void"
 require "steep/ast/types/bot"
 require "steep/ast/types/top"
+require "steep/ast/types/nil"
+require "steep/ast/types/literal"
+require "steep/ast/types/boolean"
+require "steep/ast/types/tuple"
 require "steep/ast/method_type"
 require "steep/ast/type_params"
 require "steep/ast/signature/class"

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

@@ -33,6 +33,10 @@ module Steep
         def level
           [1]
         end
+
+        def with_location(new_location)
+          self.class.new(location: new_location)
+        end
       end
     end
   end

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

@@ -0,0 +1,53 @@
+module Steep
+  module AST
+    module Types
+      class Boolean
+        attr_reader :location
+
+        def initialize(location: nil)
+          @location = location
+        end
+
+        def ==(other)
+          other.is_a?(Boolean)
+        end
+
+        def hash
+          self.class.hash
+        end
+
+        alias eql? ==
+
+        def subst(s)
+          self
+        end
+
+        def to_s
+          "bool"
+        end
+
+        def free_variables
+          Set.new
+        end
+
+        def level
+          [0]
+        end
+
+        def with_location(new_location)
+          self.class.new(location: new_location)
+        end
+
+        def back_type
+          Union.build(types:
+                      [
+                        Name.new_instance(name: "::TrueClass", location: location),
+                        Name.new_instance(name: "::FalseClass", location: location)
+                      ],
+                      location: location)
+        end
+      end
+    end
+  end
+end
+

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

@@ -33,6 +33,10 @@ module Steep
         def level
           [2]
         end
+
+        def with_location(new_location)
+          self.class.new(location: new_location)
+        end
       end
     end
   end

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

@@ -29,6 +29,10 @@ module Steep
         def level
           [0]
         end
+
+        def with_location(new_location)
+          self.class.new(location: new_location)
+        end
       end
     end
   end

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

@@ -33,6 +33,10 @@ module Steep
         def level
           [0]
         end
+
+        def with_location(new_location)
+          self.class.new(location: new_location)
+        end
       end
     end
   end

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

@@ -68,6 +68,10 @@ module Steep
         def level
           [0] + level_of_children(types)
         end
+
+        def with_location(new_location)
+          self.class.new(types: types, location: new_location)
+        end
       end
     end
   end

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

@@ -0,0 +1,59 @@
+module Steep
+  module AST
+    module Types
+      class Literal
+        attr_reader :location
+        attr_reader :value
+
+        def initialize(value:, location: nil)
+          @location = location
+          @value = value
+        end
+
+        def ==(other)
+          other.is_a?(Literal) &&
+            other.value == value
+        end
+
+        def hash
+          self.class.hash
+        end
+
+        alias eql? ==
+
+        def subst(s)
+          self
+        end
+
+        def to_s
+          value.inspect
+        end
+
+        def free_variables
+          Set.new
+        end
+
+        def level
+          [0]
+        end
+
+        def with_location(new_location)
+          self.class.new(location: new_location)
+        end
+
+        def back_type
+          case value
+          when Integer
+            Name.new_instance(name: "::Integer")
+          when String
+            Name.new_instance(name: "::String")
+          when Symbol
+            Name.new_instance(name: "::Symbol")
+          else
+            raise "Unexpected literal type: #{value.inspect}"
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -32,6 +32,10 @@ module Steep
           end
         end
 
+        def with_location(new_location)
+          self.class.new(name: name, args: args, location: new_location)
+        end
+
         def self.new_module(location: nil, name:, args: [])
           name = ModuleName.parse(name) unless name.is_a?(ModuleName)
           new(location: location,

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

@@ -0,0 +1,48 @@
+module Steep
+  module AST
+    module Types
+      class Nil
+        attr_reader :location
+
+        def initialize(location: nil)
+          @location = location
+        end
+
+        def ==(other)
+          other.is_a?(Nil)
+        end
+
+        def hash
+          self.class.hash
+        end
+
+        alias eql? ==
+
+        def subst(s)
+          self
+        end
+
+        def to_s
+          "nil"
+        end
+
+        def free_variables
+          Set.new
+        end
+
+        def level
+          [0]
+        end
+
+        def with_location(new_location)
+          self.class.new(location: new_location)
+        end
+
+        def back_type
+          Name.new_instance(name: "::NilClass", location: location)
+        end
+      end
+    end
+  end
+end
+

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

@@ -33,6 +33,10 @@ module Steep
         def level
           [0]
         end
+
+        def with_location(new_location)
+          self.class.new(location: new_location)
+        end
       end
     end
   end

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

@@ -33,6 +33,10 @@ module Steep
         def level
           [2]
         end
+
+        def with_location(new_location)
+          self.class.new(location: new_location)
+        end
       end
     end
   end

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

@@ -0,0 +1,51 @@
+module Steep
+  module AST
+    module Types
+      class Tuple
+        attr_reader :types
+        attr_reader :location
+
+        def initialize(types:, location: nil)
+          @types = types
+          @location = location
+        end
+
+        def ==(other)
+          other.is_a?(Tuple) &&
+            other.types == types
+        end
+
+        def hash
+          self.class.hash ^ types.hash
+        end
+
+        alias eql? ==
+
+        def subst(s)
+          self.class.new(location: location,
+                         types: types.map {|ty| ty.subst(s) })
+        end
+
+        def to_s
+          "[#{types.join(", ")}]"
+        end
+
+        def free_variables
+          types.each.with_object(Set.new) do |type, set|
+            set.merge(type.free_variables)
+          end
+        end
+
+        include Helper::ChildrenLevel
+
+        def level
+          [0] + level_of_children(types)
+        end
+
+        def with_location(new_location)
+          self.class.new(types: types, location: new_location)
+        end
+      end
+    end
+  end
+end

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

@@ -68,6 +68,10 @@ module Steep
         def level
           [0] + level_of_children(types)
         end
+
+        def with_location(new_location)
+          self.class.new(types: types, location: new_location)
+        end
       end
     end
   end

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

@@ -51,6 +51,10 @@ module Steep
         def level
           [0]
         end
+
+        def with_location(new_location)
+          self.class.new(name: name, location: new_location)
+        end
       end
     end
   end

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

@@ -29,6 +29,10 @@ module Steep
         def free_variables
           Set.new
         end
+
+        def with_location(new_location)
+          self.class.new(location: new_location)
+        end
       end
     end
   end

data/lib/steep/drivers/scaffold.rb

@@ -213,7 +213,7 @@ module Steep
           return "any" unless node
           case node.type
           when :false, :true
-            "_Boolean"
+            "bool"
           when :int
             "Integer"
           when :float

data/lib/steep/errors.rb

@@ -475,5 +475,20 @@ module Steep
         "#{location_to_str}: UnexpectedSplat: type=#{type}"
       end
     end
+
+    class IncompatibleTuple < Base
+      attr_reader :expected_tuple
+      include ResultPrinter
+
+      def initialize(node:, expected_tuple:, result:)
+        super(node: node)
+        @result = result
+        @expected_tuple = expected_tuple
+      end
+
+      def to_s
+        "#{location_to_str}: IncompatibleTuple: expected_tuple=#{expected_tuple}"
+      end
+    end
   end
 end

data/lib/steep/interface/builder.rb

@@ -68,6 +68,11 @@ module Steep
             types: type.types.map {|ty| absolute_type(ty, current: current) },
             location: type.location
           )
+        when AST::Types::Tuple
+          AST::Types::Tuple.new(
+            types: type.types.map {|ty| absolute_type(ty, current:current) },
+            location: type.location
+          )
         else
           type
         end

data/lib/steep/interface/method.rb

@@ -48,6 +48,16 @@ module Steep
         )
       end
 
+      def with_types(types)
+        self.class.new(
+          type_name: type_name,
+          name: name,
+          types: types,
+          super_method: super_method,
+          attributes: attributes
+        )
+      end
+
       def include_in_chain?(method)
         (method.type_name == type_name &&
           method.name == name &&