Merge pull request #307 from ruby/syntax-update

Syntax update

Author: soutaro

Rakefile

@@ -13,6 +13,11 @@ multitask :default => [:test, :stdlib_test, :rubocop, :validate]
 
 task :validate => :parser do
   sh "rbs validate"
+
+  FileList["stdlib/*"].each do |path|
+    next if path =~ %r{stdlib/builtin}
+    sh "rbs -r#{File.basename(path)} validate"
+  end
 end
 
 FileList["test/stdlib/**/*_test.rb"].each do |test|
@@ -53,8 +58,10 @@ namespace :generate do
       def initialize(klass)
         @klass = klass
 
-        @env = Ruby::Signature::Environment.new
-        Ruby::Signature::EnvironmentLoader.new.load(env: @env)
+        @env = Ruby::Signature::Environment.new.yield_self do |env|
+          Ruby::Signature::EnvironmentLoader.new.load(env: env)
+          env.resolve_type_names
+        end
       end
 
       def call
@@ -122,13 +129,13 @@ namespace :generate do
 
       def class_methods
         @class_methods ||= Ruby::Signature::DefinitionBuilder.new(env: env).build_singleton(type_name).methods.select {|_, definition|
-          definition.implemented_in.name.absolute! == type_name
+          definition.implemented_in == type_name
         }
       end
 
       def instance_methods
         @instance_methods ||= Ruby::Signature::DefinitionBuilder.new(env: env).build_instance(type_name).methods.select {|_, definition|
-          definition.implemented_in.name.absolute! == type_name
+          definition.implemented_in == type_name
         }
       end
     end

lib/rbs.rb

@@ -32,8 +32,10 @@
 require "rbs/prototype/rbi"
 require "rbs/prototype/rb"
 require "rbs/prototype/runtime"
+require "rbs/type_name_resolver"
 require "rbs/environment_walker"
 require "rbs/vendorer"
+require "rbs/validator"
 
 begin
   require "rbs/parser"

lib/rbs/ast/declarations.rb

@@ -1,6 +1,9 @@
 module RBS
   module AST
     module Declarations
+      class Base
+      end
+
       class ModuleTypeParams
         attr_reader :params
 
@@ -77,7 +80,53 @@ def rename_to(names)
         end
       end
 
-      class Class
+      module NestedDeclarationHelper
+        def each_member
+          if block_given?
+            members.each do |member|
+              if member.is_a?(Members::Base)
+                yield member
+              end
+            end
+          else
+            enum_for :each_member
+          end
+        end
+
+        def each_decl
+          if block_given?
+            members.each do |member|
+              if member.is_a?(Declarations::Base)
+                yield member
+              end
+            end
+          else
+            enum_for :each_decl
+          end
+        end
+      end
+
+      module MixinHelper
+        def each_mixin(&block)
+          if block_given?
+            @mixins ||= begin
+                          members.select do |member|
+                            case member
+                            when Members::Include, Members::Extend, Members::Prepend
+                              true
+                            else
+                              false
+                            end
+                          end
+                        end
+            @mixins.each(&block)
+          else
+            enum_for :each_mixin
+          end
+        end
+      end
+
+      class Class < Base
         class Super
           attr_reader :name
           attr_reader :args
@@ -105,6 +154,9 @@ def to_json(*a)
           end
         end
 
+        include NestedDeclarationHelper
+        include MixinHelper
+
         attr_reader :name
         attr_reader :type_params
         attr_reader :members
@@ -151,7 +203,10 @@ def to_json(*a)
         end
       end
 
-      class Module
+      class Module < Base
+        include NestedDeclarationHelper
+        include MixinHelper
+
         attr_reader :name
         attr_reader :type_params
         attr_reader :members
@@ -198,7 +253,7 @@ def to_json(*a)
         end
       end
 
-      class Extension
+      class Extension < Base
         attr_reader :name
         attr_reader :type_params
         attr_reader :extension_name
@@ -245,7 +300,7 @@ def to_json(*a)
         end
       end
 
-      class Interface
+      class Interface < Base
         attr_reader :name
         attr_reader :type_params
         attr_reader :members
@@ -288,7 +343,7 @@ def to_json(*a)
         end
       end
 
-      class Alias
+      class Alias < Base
         attr_reader :name
         attr_reader :type
         attr_reader :annotations
@@ -327,7 +382,7 @@ def to_json(*a)
         end
       end
 
-      class Constant
+      class Constant < Base
         attr_reader :name
         attr_reader :type
         attr_reader :location
@@ -363,7 +418,7 @@ def to_json(*a)
         end
       end
 
-      class Global
+      class Global < Base
         attr_reader :name
         attr_reader :type
         attr_reader :location

lib/rbs/ast/members.rb

@@ -1,37 +1,43 @@
 module RBS
   module AST
     module Members
-      class MethodDefinition
+      class Base
+      end
+
+      class MethodDefinition < Base
         attr_reader :name
         attr_reader :kind
         attr_reader :types
         attr_reader :annotations
         attr_reader :location
         attr_reader :comment
         attr_reader :attributes
+        attr_reader :overload
 
-        def initialize(name:, kind:, types:, annotations:, location:, comment:, attributes:)
+        def initialize(name:, kind:, types:, annotations:, location:, comment:, attributes:, overload:)
           @name = name
           @kind = kind
           @types = types
           @annotations = annotations
           @location = location
           @comment = comment
           @attributes = attributes
+          @overload = overload
         end
 
         def ==(other)
           other.is_a?(MethodDefinition) &&
             other.name == name &&
             other.kind == kind &&
             other.types == types &&
-            other.attributes == attributes
+            other.attributes == attributes &&
+            other.overload == overload
         end
 
         alias eql? ==
 
         def hash
-          self.class.hash ^ name.hash ^ kind.hash ^ types.hash ^ attributes.hash
+          self.class.hash ^ name.hash ^ kind.hash ^ types.hash ^ attributes.hash ^ overload.hash
         end
 
         def instance?
@@ -42,6 +48,23 @@ def singleton?
           kind == :singleton || kind == :singleton_instance
         end
 
+        def overload?
+          overload
+        end
+
+        def update(name: self.name, kind: self.kind, types: self.types, annotations: self.annotations, location: self.location, comment: self.comment, attributes: self.attributes, overload: self.overload)
+          self.class.new(
+            name: name,
+            kind: kind,
+            types: types,
+            annotations: annotations,
+            location: location,
+            comment: comment,
+            attributes: attributes,
+            overload: overload
+          )
+        end
+
         def to_json(*a)
           {
             member: :method_definition,
@@ -50,7 +73,8 @@ def to_json(*a)
             annotations: annotations,
             location: location,
             comment: comment,
-            attributes: attributes
+            attributes: attributes,
+            overload: overload
           }.to_json(*a)
         end
       end
@@ -79,7 +103,7 @@ def hash
         end
       end
 
-      class InstanceVariable
+      class InstanceVariable < Base
         include Var
 
         def to_json(*a)
@@ -93,7 +117,7 @@ def to_json(*a)
         end
       end
 
-      class ClassInstanceVariable
+      class ClassInstanceVariable < Base
         include Var
 
         def to_json(*a)
@@ -107,7 +131,7 @@ def to_json(*a)
         end
       end
 
-      class ClassVariable
+      class ClassVariable < Base
         include Var
 
         def to_json(*a)
@@ -149,7 +173,7 @@ def hash
         end
       end
 
-      class Include
+      class Include < Base
         include Mixin
 
         def to_json(*a)
@@ -164,7 +188,7 @@ def to_json(*a)
         end
       end
 
-      class Extend
+      class Extend < Base
         include Mixin
 
         def to_json(*a)
@@ -179,7 +203,7 @@ def to_json(*a)
         end
       end
 
-      class Prepend
+      class Prepend < Base
         include Mixin
 
         def to_json(*a)
@@ -225,7 +249,7 @@ def hash
         end
       end
 
-      class AttrReader
+      class AttrReader < Base
         include Attribute
 
         def to_json(*a)
@@ -241,7 +265,7 @@ def to_json(*a)
         end
       end
 
-      class AttrAccessor
+      class AttrAccessor < Base
         include Attribute
 
         def to_json(*a)
@@ -257,7 +281,7 @@ def to_json(*a)
         end
       end
 
-      class AttrWriter
+      class AttrWriter < Base
         include Attribute
 
         def to_json(*a)
@@ -291,23 +315,23 @@ def hash
         end
       end
 
-      class Public
+      class Public < Base
         include LocationOnly
 
         def to_json(*a)
           { member: :public, location: location }.to_json(*a)
         end
       end
 
-      class Private
+      class Private < Base
         include LocationOnly
 
         def to_json(*a)
           { member: :private, location: location }.to_json(*a)
         end
       end
 
-      class Alias
+      class Alias < Base
         attr_reader :new_name
         attr_reader :old_name
         attr_reader :kind