steep 0.5.1 → 0.6.0

data/lib/steep/type_inference/block_params.rb

@@ -149,13 +149,13 @@ module Steep
             type = params_type.required[0]
 
             case
-            when array?(type)
+            when AST::Builtin::Array.instance_type?(type)
               type_arg = type.args[0]
               params.each do |param|
                 unless param == rest_param
-                  zip << [param, AST::Types::Union.build(types: [type_arg, AST::Types::Nil.new])]
+                  zip << [param, AST::Types::Union.build(types: [type_arg, AST::Builtin.nil_type])]
                 else
-                  zip << [param, AST::Types::Name.new_instance(name: "::Array", args: [type_arg])]
+                  zip << [param, AST::Builtin::Array.instance_type(type_arg)]
                 end
               end
             when type.is_a?(AST::Types::Tuple)
@@ -172,7 +172,7 @@ module Steep
               if rest_param
                 if types.any?
                   union = AST::Types::Union.build(types: types)
-                  zip << [rest_param, AST::Types::Name.new_instance(name: "::Array", args: [union])]
+                  zip << [rest_param, AST::Builtin::Array.instance_type(union)]
                 else
                   zip << [rest_param, AST::Types::Nil.new]
                 end
@@ -187,23 +187,17 @@ module Steep
               if type
                 zip << [param, type]
               else
-                zip << [param, AST::Types::Nil.new]
+                zip << [param, AST::Builtin.nil_type]
               end
             end
 
             if rest_param
               if types.empty?
-                array = AST::Types::Name.new_instance(
-                  name: "::Array",
-                  args: [params_type.rest || AST::Types::Any.new]
-                )
+                array = AST::Builtin::Array.instance_type(params_type.rest || AST::Builtin.any_type)
                 zip << [rest_param, array]
               else
                 union = AST::Types::Union.build(types: types.map(&:last) + [params_type.rest])
-                array = AST::Types::Name.new_instance(
-                  name: "::Array",
-                  args: [union]
-                )
+                array = AST::Builtin::Array.instance_type(union)
                 zip << [rest_param, array]
               end
             end
@@ -211,19 +205,13 @@ module Steep
         end
       end
 
-      def array?(type)
-        type.is_a?(AST::Types::Name) &&
-          type.name.is_a?(TypeName::Instance) &&
-          type.name.name.name == "Array" && type.name.name.absolute?
-      end
-
       def expandable_params?(params_type)
         if params_type.flat_unnamed_params.size == 1
           case (type = params_type.required.first)
           when AST::Types::Tuple
             true
-          when AST::Types::Name
-            array?(type)
+          when AST::Types::Name::Base
+            AST::Builtin::Array.instance_type?(type)
           end
         end
       end

data/lib/steep/type_inference/constant_env.rb

@@ -2,51 +2,47 @@ module Steep
   module TypeInference
     class ConstantEnv
       attr_reader :builder
-      attr_reader :current_namespace
+      attr_reader :context
       attr_reader :cache
 
-      def initialize(builder:, current_namespace:)
+      # ConstantEnv receives an optional Names::Module, not a Namespace, because this is a simulation of Ruby.
+      # Any namespace is a module or class.
+      def initialize(builder:, context:)
         @cache = {}
         @builder = builder
-        @current_namespace = current_namespace
+        @context = context
       end
 
       def signatures
         builder.signatures
       end
 
-      def lookup(name)
-        unless cache.key?(name)
-          cache[name] = lookup0(name, namespace: current_namespace)
-        end
+      def namespace
+        @namespace ||= if context
+                         context.namespace.append(context.name)
+                       else
+                         AST::Namespace.root
+                       end
+      end
 
-        cache[name]
+      def lookup(name)
+        cache[name] ||= lookup0(name, namespace: namespace)
       end
 
+      # @type method lookup0: (Names::Module, namespace: AST::Namespace) -> Type
       def lookup0(name, namespace:)
-        if name.absolute?
-          case
-          when signatures.module_name?(name)
-            AST::Types::Name.new_module(name: name)
-          when signatures.class_name?(name)
-            AST::Types::Name.new_class(name: name, constructor: true)
-          when signatures.const_name?(name)
-            builder.absolute_type(signatures.find_const(name).type, current: nil)
-          end
+        full_name = name.in_namespace(namespace)
+        case
+        when signatures.module_name?(full_name)
+          AST::Types::Name::Module.new(name: full_name)
+        when signatures.class_name?(full_name)
+          AST::Types::Name::Class.new(name: full_name, constructor: true)
+        when signatures.const_name?(full_name)
+          builder.absolute_type(signatures.find_const(name, current_module: namespace).type,
+                                current: namespace)
         else
-          if namespace
-            case
-            when signatures.module_name?(name, current_module: namespace)
-              AST::Types::Name.new_module(name: namespace + name)
-            when signatures.class_name?(name, current_module: namespace)
-              AST::Types::Name.new_class(name: namespace + name, constructor: true)
-            when signatures.const_name?(name, current_module: namespace)
-              builder.absolute_type(signatures.find_const(name, current_module: namespace).type, current: nil)
-            else
-              lookup0(name, namespace: namespace.parent)
-            end
-          else
-            lookup0(name.absolute!, namespace: nil)
+          unless namespace.empty?
+            lookup0(name, namespace: namespace.parent)
           end
         end
       end

data/lib/steep/type_inference/send_args.rb

@@ -123,12 +123,9 @@ module Steep
 
               if kwsplat_nodes.any?
                 pairs << [kw_args,
-                          AST::Types::Name.new_instance(
-                            name: "::Hash",
-                            args: [
-                              AST::Types::Name.new_instance(name: "::Symbol"),
-                              AST::Types::Union.build(types: rest_types + [params.rest_keywords])
-                            ]
+                          AST::Builtin::Hash.instance_type(
+                            AST::Builtin::Symbol.instance_type,
+                            AST::Types::Union.build(types: rest_types + [params.rest_keywords])
                           )]
               end
             end
@@ -185,7 +182,7 @@ module Steep
 
               if types
                 if arg.type == :splat
-                  type = AST::Types::Name.new_instance(name: "::Array", args: [AST::Types::Union.build(types: types)])
+                  type = AST::Builtin::Array.instance_type(AST::Types::Union.build(types: types))
                 else
                   type = AST::Types::Union.build(types: types)
                 end

data/lib/steep/type_inference/type_env.rb

@@ -38,7 +38,7 @@ module Steep
             env.set(const: name, type: type)
           end
           signatures.globals.each do |name, annot|
-            type = subtyping.builder.absolute_type(annot.type, current: nil)
+            type = subtyping.builder.absolute_type(annot.type, current: AST::Namespace.root)
             env.set(gvar: name, type: type)
           end
         end
@@ -83,7 +83,7 @@ module Steep
         end
       end
 
-      # @type method assert: (const: ModuleName) { () -> void } -> AST::Type
+      # @type method assert: (const: Names::Module) { () -> void } -> AST::Type
       #                    | (gvar: Symbol) { () -> void } -> AST::Type
       #                    | (ivar: Symbol) { () -> void } -> AST::Type
       #                    | (lvar: Symbol) { () -> AST::Type | nil } -> AST::Type
@@ -138,7 +138,7 @@ module Steep
         end
       end
 
-      # @type method assign: (const: ModuleName, type: AST::Type) { (Subtyping::Result::Failure | nil) -> void } -> AST::Type
+      # @type method assign: (const: Names::Module, type: AST::Type) { (Subtyping::Result::Failure | nil) -> void } -> AST::Type
       #                    | (gvar: Symbol, type: AST::Type) { (Subtyping::Result::Failure | nil) -> void } -> AST::Type
       #                    | (ivar: Symbol, type: AST::Type) { (Subtyping::Result::Failure | nil) -> void } -> AST::Type
       #                    | (lvar: Symbol | LabeledName, type: AST::Type) { (Subtyping::Result::Failure) -> void } -> AST::Type

data/lib/steep/version.rb

@@ -1,3 +1,3 @@
 module Steep
-  VERSION = "0.5.1"
+  VERSION = "0.6.0"
 end

data/smoke/alias/a.rb

@@ -1,7 +1,7 @@
 # @type var x: foo
 x = ""
 
-# !expects NoMethodError: type=foo, method=+
+# !expects NoMethodError: type=::foo, method=+
 x + 123
 
 # @type var y: bar<Integer>

data/smoke/alias/b.rb

@@ -3,5 +3,5 @@
 a = ["", :foo]
 
 # @type var x: Integer
-# !expects IncompatibleAssignment: lhs_type=::Integer, rhs_type=String
+# !expects IncompatibleAssignment: lhs_type=::Integer, rhs_type=::String
 x = a[0]

data/smoke/class/i.rbi

@@ -3,7 +3,7 @@ class IncompatibleSuper
   def initialize: (name: String) -> any
 end
 
-class IncompatibleChild <: IncompatibleSuper
+class IncompatibleChild < IncompatibleSuper
   def initialize: () -> any
   def (incompatible) foo: (Object) -> String
 end

data/smoke/hash/a.rbi

@@ -0,0 +1,8 @@
+type t = {
+  id: Integer,
+  name: String
+}
+
+class Controller
+  def params: -> { id: Integer, name: String }
+end

data/smoke/hash/c.rb

@@ -0,0 +1,18 @@
+# @type var params: t
+params = _ = nil
+
+id = params[:id]
+# !expects NoMethodError: type=::Integer, method=abcdefg
+id.abcdefg
+
+name = params[:name]
+# !expects NoMethodError: type=::String, method=abcdefg
+name.abcdefg
+
+# !expects NoMethodError: type=(::Integer | ::String | nil), method=abcdefg
+params[(_=nil) ? :id : :name].abcdefg
+
+# @type var controller: Controller
+controller = _ = nil
+
+controller.params[:id] + 3

data/smoke/hash/d.rb

@@ -0,0 +1,6 @@
+# @type var params: { name: String, id: Integer }
+
+params = { id: 30, name: "Matz" }
+
+# !expects IncompatibleAssignment: lhs_type={ :name => ::String, :id => ::Integer }, rhs_type=::Hash<::Symbol, ::String>
+params = { id: "30", name: "foo", email: "matsumoto@soutaro.com" }

data/smoke/hello/hello.rb

@@ -6,8 +6,8 @@ y = (_ = nil)
 
 a = x.foo
 
-# !expects NoMethodError: type=_Bar, method=foo
+# !expects NoMethodError: type=::_Bar, method=foo
 b = y.foo
 
-# !expects IncompatibleAssignment: lhs_type=_Foo, rhs_type=_Bar
+# !expects IncompatibleAssignment: lhs_type=::_Foo, rhs_type=::_Bar
 x = y

data/smoke/interface/a.rb

@@ -0,0 +1,14 @@
+class A
+  # @dynamic foo
+
+  def hello
+    # !expects NoMethodError: type=::A::Object, method=bar
+    foo.foo.bar
+
+    # @type var object: ::Object
+    object = _ = nil
+
+    # !expects NoMethodError: type=::Object, method=object?
+    object.object?
+  end
+end

data/smoke/interface/a.rbi

@@ -0,0 +1,12 @@
+class A
+  def foo: -> _Foo
+  def hello: -> void
+end
+
+class A::Object
+  def object?: -> bool
+end
+
+interface A::_Foo
+  def foo: -> Object
+end

data/smoke/module/a.rb

@@ -13,7 +13,7 @@ module A
     # !expects IncompatibleAssignment: lhs_type=::String, rhs_type=::Integer
     s = n
 
-    # !expects NoMethodError: type=(::A & ::Object & _Each<::Integer>), method=foo
+    # !expects NoMethodError: type=(::A & ::Object & ::_Each<::Integer, ::A>), method=foo
     foo()
 
     n

data/smoke/module/a.rbi

@@ -1,8 +1,8 @@
-interface _Each<'a>
-  def each: { ('a) -> any } -> instance
+interface _Each<'a, 'b>
+  def each: { ('a) -> any } -> 'b
 end
 
-module A : _Each<Integer>
+module A : _Each<Integer, A>
   def count: () -> Integer
 end
 

data/smoke/module/b.rb

@@ -1,6 +1,6 @@
 # ALLOW FAILURE
 
-# @type var klass: Class<any>
+# @type var klass: Class
 # @type var mod: Module
 
 3.is_a?(3.class)

data/smoke/stdout/a.rb

@@ -4,5 +4,5 @@ class A
   end
 end
 
-A.new(STDOUT)
-A.new(StringIO.new)
+A.new.write_to(io: STDOUT)
+A.new.write_to(io: StringIO.new)

data/stdlib/builtin.rbi

@@ -2,7 +2,7 @@ class BasicObject
   def __id__: -> Integer
 end
 
-class Object <: BasicObject
+class Object < BasicObject
   include Kernel
   def tap: { (self) -> any } -> self
   def to_s: -> String
@@ -43,8 +43,7 @@ end
 class Method
 end
 
-class Class<'instance> <: Module
-  def new: (*any, **any) -> 'instance
+class Class < Module
   def class: -> Class.class
   def allocate: -> any
 end
@@ -268,7 +267,7 @@ class Numeric
   def -@: -> self
 end
 
-class Integer <: Numeric
+class Integer < Numeric
   def to_int: -> Integer
   def +: (Integer) -> Integer
        | (Numeric) -> Numeric
@@ -296,7 +295,7 @@ class Integer <: Numeric
   def ~: () -> Integer
 end
 
-class Float <: Numeric
+class Float < Numeric
   def *: (Float) -> Float
        | (Integer) -> Float
        | (Numeric) -> Numeric
@@ -313,7 +312,7 @@ end
 
 Math::PI: Float
 
-class Complex <: Numeric
+class Complex < Numeric
   def self.polar: (Numeric, Numeric) -> instance
   def +: (Complex) -> Complex
        | (Numeric) -> Numeric
@@ -572,7 +571,7 @@ end
 
 File::FNM_DOTMATCH: Integer
 
-class File <: IO
+class File < IO
   def self.binread: (String) -> String
   def self.extname: (String) -> String
   def self.basename: (String) -> String

data/steep.gemspec

@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "racc", "~> 1.4"
 
   spec.add_runtime_dependency "parser", "~> 2.4"
-  spec.add_runtime_dependency "ast_utils", "~> 0.1.0"
+  spec.add_runtime_dependency "ast_utils", "~> 0.3.0"
   spec.add_runtime_dependency "activesupport", "~> 5.1"
   spec.add_runtime_dependency "rainbow", "~> 2.2.2", "< 4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: steep
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Soutaro Matsumoto
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-13 00:00:00.000000000 Z
+date: 2018-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -151,8 +151,10 @@ files:
 - lib/steep/ast/annotation.rb
 - lib/steep/ast/annotation/collection.rb
 - lib/steep/ast/buffer.rb
+- lib/steep/ast/builtin.rb
 - lib/steep/ast/location.rb
 - lib/steep/ast/method_type.rb
+- lib/steep/ast/namespace.rb
 - lib/steep/ast/signature/alias.rb
 - lib/steep/ast/signature/class.rb
 - lib/steep/ast/signature/const.rb
@@ -167,6 +169,7 @@ files:
 - lib/steep/ast/types/boolean.rb
 - lib/steep/ast/types/bot.rb
 - lib/steep/ast/types/class.rb
+- lib/steep/ast/types/hash.rb
 - lib/steep/ast/types/helper.rb
 - lib/steep/ast/types/instance.rb
 - lib/steep/ast/types/intersection.rb
@@ -196,7 +199,7 @@ files:
 - lib/steep/interface/method.rb
 - lib/steep/interface/method_type.rb
 - lib/steep/interface/substitution.rb
-- lib/steep/module_name.rb
+- lib/steep/names.rb
 - lib/steep/parser.rb
 - lib/steep/parser.y
 - lib/steep/signature/errors.rb
@@ -214,7 +217,6 @@ files:
 - lib/steep/type_inference/constant_env.rb
 - lib/steep/type_inference/send_args.rb
 - lib/steep/type_inference/type_env.rb
-- lib/steep/type_name.rb
 - lib/steep/typing.rb
 - lib/steep/version.rb
 - manual/annotations.md
@@ -258,7 +260,10 @@ files:
 - smoke/extension/c.rb
 - smoke/extension/d.rb
 - smoke/hash/a.rb
+- smoke/hash/a.rbi
 - smoke/hash/b.rb
+- smoke/hash/c.rb
+- smoke/hash/d.rb
 - smoke/hello/hello.rb
 - smoke/hello/hello.rbi
 - smoke/if/a.rb
@@ -266,6 +271,8 @@ files:
 - smoke/implements/a.rbi
 - smoke/initialize/a.rb
 - smoke/initialize/a.rbi
+- smoke/interface/a.rb
+- smoke/interface/a.rbi
 - smoke/kwbegin/a.rb
 - smoke/lambda/a.rb
 - smoke/literal/a.rb
@@ -317,7 +324,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Gradual Typing for Ruby