rbs 0.4.0 → 0.5.0

data/lib/rbs/variance_calculator.rb

@@ -107,9 +107,19 @@ module RBS
           end
         end
       when Types::ClassInstance, Types::Interface
-        decl = env.find_class(type.name)
+        NoTypeFoundError.check!(type.name,
+                                env: env,
+                                location: type.location)
+
+        type_params = case type
+                      when Types::ClassInstance
+                        env.class_decls[type.name]&.type_params
+                      when Types::Interface
+                        env.interface_decls[type.name]&.decl&.type_params
+                      end
+
         type.args.each.with_index do |ty, i|
-          var = decl.type_params.params[i]
+          var = type_params.params[i]
           case var.variance
           when :invariant
             type(ty, result: result, context: :invariant)

data/lib/rbs/version.rb

@@ -1,3 +1,3 @@
 module RBS
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

data/lib/rbs/writer.rb

@@ -1,37 +1,59 @@
 module RBS
   class Writer
     attr_reader :out
+    attr_reader :indentation
 
     def initialize(out:)
       @out = out
+      @indentation = []
     end
 
-    def write_annotation(annotations, level:)
-      prefix = " " * level
+    def indent(size = 2)
+      indentation.push(" " * size)
+      yield
+    ensure
+      indentation.pop
+    end
+
+    def prefix
+      indentation.join()
+    end
+
+    def puts(string = "")
+      if string.size > 0
+        @out.puts("#{prefix}#{string}")
+      else
+        @out.puts
+      end
+    end
 
+    def write_annotation(annotations)
       annotations.each do |annotation|
         string = annotation.string
         case
         when string !~ /\}/
-          out.puts "#{prefix}%a{#{string}}"
+          puts "%a{#{string}}"
         when string !~ /\)/
-          out.puts "#{prefix}%a(#{string})"
+          puts "%a(#{string})"
         when string !~ /\]/
-          out.puts "#{prefix}%a[#{string}]"
+          puts "%a[#{string}]"
         when string !~ /\>/
-          out.puts "#{prefix}%a<#{string}>"
+          puts "%a<#{string}>"
         when string !~ /\|/
-          out.puts "#{prefix}%a|#{string}|"
+          puts "%a|#{string}|"
         end
       end
     end
 
-    def write_comment(comment, level:)
+    def write_comment(comment)
       if comment
-        prefix = " " * level
         comment.string.lines.each do |line|
-          line = " #{line}" unless line.chomp.empty?
-          out.puts "#{prefix}##{line}"
+          line = line.chomp
+          unless line.empty?
+            puts "# #{line}"
+          else
+            puts "#"
+          end
         end
       end
     end
@@ -49,68 +71,72 @@ module RBS
         super_class = if decl.super_class
                         " < #{name_and_args(decl.super_class.name, decl.super_class.args)}"
                       end
-        write_comment decl.comment, level: 0
-        write_annotation decl.annotations, level: 0
-        out.puts "class #{name_and_params(decl.name, decl.type_params)}#{super_class}"
+        write_comment decl.comment
+        write_annotation decl.annotations
+        puts "class #{name_and_params(decl.name, decl.type_params)}#{super_class}"
 
-        [nil, *decl.members].each_cons(2) do |prev, member|
-          preserve_empty_line prev, member
-          write_member member
+        indent do
+          [nil, *decl.members].each_cons(2) do |prev, member|
+            preserve_empty_line prev, member
+            write_member member
+          end
         end
 
-        out.puts "end"
+        puts "end"
 
       when AST::Declarations::Module
         self_type = if decl.self_type
                       " : #{decl.self_type}"
                     end
 
-        write_comment decl.comment, level: 0
-        write_annotation decl.annotations, level: 0
-        out.puts "module #{name_and_params(decl.name, decl.type_params)}#{self_type}"
-        decl.members.each.with_index do |member, index|
-          if index > 0
-            out.puts
+        write_comment decl.comment
+        write_annotation decl.annotations
+
+        puts "module #{name_and_params(decl.name, decl.type_params)}#{self_type}"
+
+        indent do
+          decl.members.each.with_index do |member, index|
+            if index > 0
+              puts
+            end
+            write_member member
           end
-          write_member member
         end
-        out.puts "end"
+
+        puts "end"
       when AST::Declarations::Constant
-        write_comment decl.comment, level: 0
-        out.puts "#{decl.name}: #{decl.type}"
+        write_comment decl.comment
+        puts "#{decl.name}: #{decl.type}"
 
       when AST::Declarations::Global
-        write_comment decl.comment, level: 0
-        out.puts "#{decl.name}: #{decl.type}"
+        write_comment decl.comment
+        puts "#{decl.name}: #{decl.type}"
 
       when AST::Declarations::Alias
-        write_comment decl.comment, level: 0
-        write_annotation decl.annotations, level: 0
-        out.puts "type #{decl.name} = #{decl.type}"
+        write_comment decl.comment
+        write_annotation decl.annotations
+        puts "type #{decl.name} = #{decl.type}"
 
       when AST::Declarations::Interface
-        write_comment decl.comment, level: 0
-        write_annotation decl.annotations, level: 0
-        out.puts "interface #{name_and_params(decl.name, decl.type_params)}"
-        decl.members.each.with_index do |member, index|
-          if index > 0
-            out.puts
+        write_comment decl.comment
+        write_annotation decl.annotations
+
+        puts "interface #{name_and_params(decl.name, decl.type_params)}"
+
+        indent do
+          decl.members.each.with_index do |member, index|
+            if index > 0
+              puts
+            end
+            write_member member
           end
-          write_member member
         end
-        out.puts "end"
+
+        puts "end"
 
       when AST::Declarations::Extension
-        write_comment decl.comment, level: 0
-        write_annotation decl.annotations, level: 0
-        out.puts "extension #{name_and_args(decl.name, decl.type_params)} (#{decl.extension_name})"
-        decl.members.each.with_index do |member, index|
-          if index > 0
-            out.puts
-          end
-          write_member member
-        end
-        out.puts "end"
+        RBS.logger.warn "Extension is ignored: #{decl.name}"
+
       end
     end
 
@@ -151,52 +177,54 @@ module RBS
     def write_member(member)
       case member
       when AST::Members::Include
-        write_comment member.comment, level: 2
-        write_annotation member.annotations, level: 2
-        out.puts "  include #{name_and_args(member.name, member.args)}"
+        write_comment member.comment
+        write_annotation member.annotations
+        puts "include #{name_and_args(member.name, member.args)}"
       when AST::Members::Extend
-        write_comment member.comment, level: 2
-        write_annotation member.annotations, level: 2
-        out.puts "  extend #{name_and_args(member.name, member.args)}"
+        write_comment member.comment
+        write_annotation member.annotations
+        puts "extend #{name_and_args(member.name, member.args)}"
       when AST::Members::Prepend
-        write_comment member.comment, level: 2
-        write_annotation member.annotations, level: 2
-        out.puts "  prepend #{name_and_args(member.name, member.args)}"
+        write_comment member.comment
+        write_annotation member.annotations
+        puts "prepend #{name_and_args(member.name, member.args)}"
       when AST::Members::AttrAccessor
-        write_comment member.comment, level: 2
-        write_annotation member.annotations, level: 2
-        out.puts "  #{attribute(:accessor, member)}"
+        write_comment member.comment
+        write_annotation member.annotations
+        puts "#{attribute(:accessor, member)}"
       when AST::Members::AttrReader
-        write_comment member.comment, level: 2
-        write_annotation member.annotations, level: 2
-        out.puts "  #{attribute(:reader, member)}"
+        write_comment member.comment
+        write_annotation member.annotations
+        puts "#{attribute(:reader, member)}"
       when AST::Members::AttrWriter
-        write_comment member.comment, level: 2
-        write_annotation member.annotations, level: 2
-        out.puts "  #{attribute(:writer, member)}"
+        write_comment member.comment
+        write_annotation member.annotations
+        puts "#{attribute(:writer, member)}"
       when AST::Members::Public
-        out.puts "  public"
+        puts "public"
       when AST::Members::Private
-        out.puts "  private"
+        puts "private"
       when AST::Members::Alias
-        write_comment member.comment, level: 2
-        write_annotation member.annotations, level: 2
+        write_comment member.comment
+        write_annotation member.annotations
         new_name = member.singleton? ? "self.#{member.new_name}" : member.new_name
         old_name = member.singleton? ? "self.#{member.old_name}" : member.old_name
-        out.puts "  alias #{new_name} #{old_name}"
+        puts "alias #{new_name} #{old_name}"
       when AST::Members::InstanceVariable
-        write_comment member.comment, level: 2
-        out.puts "  #{member.name}: #{member.type}"
+        write_comment member.comment
+        puts "#{member.name}: #{member.type}"
       when AST::Members::ClassInstanceVariable
-        write_comment member.comment, level: 2
-        out.puts "  self.#{member.name}: #{member.type}"
+        write_comment member.comment
+        puts "self.#{member.name}: #{member.type}"
       when AST::Members::ClassVariable
-        write_comment member.comment, level: 2
-        out.puts "  #{member.name}: #{member.type}"
+        write_comment member.comment
+        puts "#{member.name}: #{member.type}"
       when AST::Members::MethodDefinition
-        write_comment member.comment, level: 2
-        write_annotation member.annotations, level: 2
+        write_comment member.comment
+        write_annotation member.annotations
         write_def member
+      else
+        write_decl member
       end
     end
 
@@ -220,18 +248,26 @@ module RBS
                "self.#{method_name(member.name)}"
              end
 
+      string = ""
+
       attrs = member.attributes.empty? ? "" : member.attributes.join(" ") + " "
-      prefix = "  #{attrs}def #{name}:"
+      overload = member.overload? ? "overload " : ""
+      prefix = "#{overload}#{attrs}def #{name}:"
       padding = " " * (prefix.size-1)
 
-      out.print prefix
+      string << prefix
 
       member.types.each.with_index do |type, index|
         if index > 0
-          out.print padding
-          out.print "|"
+          string << padding
+          string << "|"
         end
-        out.puts " #{type}"
+
+        string << " #{type}\n"
+      end
+
+      string.each_line do |line|
+        puts line.chomp
       end
     end
 
@@ -255,14 +291,14 @@ module RBS
       # When the signature is not constructed by the parser,
       # it always inserts an empty line.
       if !prev.location || !decl.location
-        out.puts
+        puts
         return
       end
 
       prev_end_line = prev.location.end_line
       start_line = decl.location.start_line
       if start_line - prev_end_line > 1
-        out.puts
+        puts
       end
     end
   end

data/rbs.gemspec

@@ -34,14 +34,4 @@ Gem::Specification.new do |spec|
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
-
-  spec.add_development_dependency "bundler"
-  spec.add_development_dependency "rake", "~> 13.0"
-  spec.add_development_dependency "minitest", "~> 5.0"
-  spec.add_development_dependency "racc", "~> 1.4.16"
-  spec.add_development_dependency "rubocop"
-  spec.add_development_dependency "rubocop-rubycw"
-  spec.add_development_dependency "minitest-reporters", "~> 1.3.6"
-  spec.add_development_dependency "json", "~> 2.3.0"
-  spec.add_development_dependency "json-schema", "~> 2.8"
 end

data/schema/decls.json

@@ -116,6 +116,21 @@
         },
         {
           "$ref": "members.json#/definitions/alias"
+        },
+        {
+          "$ref": "#/definitions/alias"
+        },
+        {
+          "$ref": "#/definitions/constant"
+        },
+        {
+          "$ref": "#/definitions/class"
+        },
+        {
+          "$ref": "#/definitions/module"
+        },
+        {
+          "$ref": "#/definitions/interface"
         }
       ]
     },

data/schema/members.json

@@ -34,6 +34,9 @@
         },
         "location": {
           "$ref": "location.json"
+        },
+        "overload": {
+          "type": "boolean"
         }
       },
       "required": ["member", "kind", "types", "comment", "annotations", "location"]

data/stdlib/benchmark/benchmark.rbs

@@ -139,7 +139,7 @@ module Benchmark
   #     >total:   2.930000   0.000000   2.930000 (  2.932889)
   #     >avg:     0.976667   0.000000   0.976667 (  0.977630)
   #
-  def self?.benchmark: (String caption, ?Integer? label_width, ?String? format, *String labels) { (Report report) -> (Array[Tms] | void) } -> ::Array[Benchmark::Tms]
+  def self?.benchmark: (String caption, ?Integer? label_width, ?String? format, *String labels) { (Report report) -> (Array[Tms] | void) } -> Array[Tms]
 
   # A simple interface to the #benchmark method, #bm generates sequential reports
   # with labels. `label_width` and `labels` parameters have the same meaning as
@@ -161,7 +161,7 @@ module Benchmark
   #     times:    0.960000   0.000000   0.960000 (  0.960423)
   #     upto:     0.950000   0.000000   0.950000 (  0.954864)
   #
-  def self?.bm: (?Integer label_width, *String labels) { (Report report) -> void } -> ::Array[Benchmark::Tms]
+  def self?.bm: (?Integer label_width, *String labels) { (Report report) -> void } -> Array[Tms]
 
   # Sometimes benchmark results are skewed because code executed earlier
   # encounters different garbage collection overheads than that run later. #bmbm
@@ -198,7 +198,7 @@ module Benchmark
   # #bmbm yields a Benchmark::Job object and returns an array of Benchmark::Tms
   # objects.
   #
-  def self?.bmbm: (?Integer width) { (Job job) -> void } -> ::Array[Benchmark::Tms]
+  def self?.bmbm: (?Integer width) { (Job job) -> void } -> Array[Tms]
 
   # Returns the time used to execute the given block as a Benchmark::Tms object.
   # Takes `label` option.
@@ -216,157 +216,157 @@ module Benchmark
   #
   #     0.220000   0.000000   0.220000 (  0.227313)
   #
-  def self?.measure: (?String label) { () -> void } -> Benchmark::Tms
+  def self?.measure: (?String label) { () -> void } -> Tms
 
   # Returns the elapsed real time used to execute the given block.
   #
   def self?.realtime: () { () -> void } -> Float
-end
-
-Benchmark::BENCHMARK_VERSION: String
-
-# The default caption string (heading above the output times).
-#
-Benchmark::CAPTION: String
-
-# The default format string used to display times.  See also
-# Benchmark::Tms#format.
-#
-Benchmark::FORMAT: String
-
-class Benchmark::Job
-  # Prints the `label` and measured time for the block,
-  # formatted by `format`. See Tms#format for the
-  # formatting rules.
-  def item: (?String label) { () -> void } -> self
-
-  # An array of 2-element arrays, consisting of label and block pairs.
-  def list: () -> ::Array[untyped]
-
-  alias report item
-
-  # Length of the widest label in the #list.
-  def width: () -> Integer
-end
-
-class Benchmark::Report
-  # Prints the `label` and measured time for the block,
-  # formatted by `format`. See Tms#format for the
-  # formatting rules.
-  def item: (?String label, *untyped format) { () -> void } -> Tms
-
-  # An array of Benchmark::Tms objects representing each item.
-  def list: () -> ::Array[Benchmark::Tms]
-
-  alias report item
-end
-
-# A data object, representing the times associated with a benchmark measurement.
-#
-class Benchmark::Tms
-  # Returns a new Tms object obtained by memberwise multiplication of the
-  # individual times for this Tms object by `x`.
-  #
-  def *: (untyped x) -> untyped
-
-  # Returns a new Tms object obtained by memberwise summation of the individual
-  # times for this Tms object with those of the `other` Tms object. This method
-  # and #/() are useful for taking statistics.
-  #
-  def +: (untyped other) -> untyped
-
-  # Returns a new Tms object obtained by memberwise subtraction of the individual
-  # times for the `other` Tms object from those of this Tms object.
-  #
-  def -: (untyped other) -> untyped
-
-  # Returns a new Tms object obtained by memberwise division of the individual
-  # times for this Tms object by `x`. This method and #+() are useful for taking
-  # statistics.
-  #
-  def /: (untyped x) -> untyped
-
-  # Returns a new Tms object whose times are the sum of the times for this Tms
-  # object, plus the time required to execute the code block (`blk`).
-  #
-  def add: () { (*untyped) -> untyped } -> untyped
-
-  # An in-place version of #add. Changes the times of this Tms object by making it
-  # the sum of the times for this Tms object, plus the time required to execute
-  # the code block (`blk`).
-  #
-  def add!: () { (*untyped) -> untyped } -> untyped
-
-  # System CPU time of children
-  #
-  def cstime: () -> Float
-
-  # User CPU time of children
-  #
-  def cutime: () -> Float
-
-  # Returns the contents of this Tms object as a formatted string, according to a
-  # `format` string like that passed to Kernel.format. In addition, #format
-  # accepts the following extensions:
-  #
-  # `%u`
-  # :   Replaced by the user CPU time, as reported by Tms#utime.
-  # `%y`
-  # :   Replaced by the system CPU time, as reported by #stime (Mnemonic: y of
-  #     "s*y*stem")
-  # `%U`
-  # :   Replaced by the children's user CPU time, as reported by Tms#cutime
-  # `%Y`
-  # :   Replaced by the children's system CPU time, as reported by Tms#cstime
-  # `%t`
-  # :   Replaced by the total CPU time, as reported by Tms#total
-  # `%r`
-  # :   Replaced by the elapsed real time, as reported by Tms#real
-  # `%n`
-  # :   Replaced by the label string, as reported by Tms#label (Mnemonic: n of
-  #     "*n*ame")
-  #
-  #
-  # If `format` is not given, FORMAT is used as default value, detailing the user,
-  # system and real elapsed time.
-  #
-  def format: (?String format, *untyped args) -> String
-
-  # Label
-  #
-  def label: () -> String
-
-  # Elapsed real time
-  #
-  def real: () -> Float
 
-  # System CPU time
-  #
-  def stime: () -> Float
-
-  # Returns a new 6-element array, consisting of the label, user CPU time, system
-  # CPU time, children's user CPU time, children's system CPU time and elapsed
-  # real time.
-  #
-  def to_a: () -> untyped
-
-  # Same as #format.
-  #
-  def to_s: () -> String
-
-  # Total time, that is `utime` + `stime` + `cutime` + `cstime`
-  #
-  def total: () -> Float
-
-  # User CPU time
-  #
-  def utime: () -> Float
+  BENCHMARK_VERSION: String
+
+  # The default caption string (heading above the output times).
+  #
+  CAPTION: String
+
+  # The default format string used to display times.  See also
+  # Benchmark::Tms#format.
+  #
+  FORMAT: String
+
+  class Job
+    # Prints the `label` and measured time for the block,
+    # formatted by `format`. See Tms#format for the
+    # formatting rules.
+    def item: (?String label) { () -> void } -> self
+
+    # An array of 2-element arrays, consisting of label and block pairs.
+    def list: () -> Array[untyped]
+
+    alias report item
+
+    # Length of the widest label in the #list.
+    def width: () -> Integer
+  end
+
+  class Report
+    # Prints the `label` and measured time for the block,
+    # formatted by `format`. See Tms#format for the
+    # formatting rules.
+    def item: (?String label, *untyped format) { () -> void } -> Tms
+
+    # An array of Benchmark::Tms objects representing each item.
+    def list: () -> Array[Tms]
+
+    alias report item
+  end
+
+  # A data object, representing the times associated with a benchmark measurement.
+  #
+  class Tms
+    # Returns a new Tms object obtained by memberwise multiplication of the
+    # individual times for this Tms object by `x`.
+    #
+    def *: (untyped x) -> untyped
+
+    # Returns a new Tms object obtained by memberwise summation of the individual
+    # times for this Tms object with those of the `other` Tms object. This method
+    # and #/() are useful for taking statistics.
+    #
+    def +: (untyped other) -> untyped
+
+    # Returns a new Tms object obtained by memberwise subtraction of the individual
+    # times for the `other` Tms object from those of this Tms object.
+    #
+    def -: (untyped other) -> untyped
+
+    # Returns a new Tms object obtained by memberwise division of the individual
+    # times for this Tms object by `x`. This method and #+() are useful for taking
+    # statistics.
+    #
+    def /: (untyped x) -> untyped
+
+    # Returns a new Tms object whose times are the sum of the times for this Tms
+    # object, plus the time required to execute the code block (`blk`).
+    #
+    def add: () { (*untyped) -> untyped } -> untyped
+
+    # An in-place version of #add. Changes the times of this Tms object by making it
+    # the sum of the times for this Tms object, plus the time required to execute
+    # the code block (`blk`).
+    #
+    def add!: () { (*untyped) -> untyped } -> untyped
+
+    # System CPU time of children
+    #
+    def cstime: () -> Float
+
+    # User CPU time of children
+    #
+    def cutime: () -> Float
+
+    # Returns the contents of this Tms object as a formatted string, according to a
+    # `format` string like that passed to Kernel.format. In addition, #format
+    # accepts the following extensions:
+    #
+    # `%u`
+    # :   Replaced by the user CPU time, as reported by Tms#utime.
+    # `%y`
+    # :   Replaced by the system CPU time, as reported by #stime (Mnemonic: y of
+    #     "s*y*stem")
+    # `%U`
+    # :   Replaced by the children's user CPU time, as reported by Tms#cutime
+    # `%Y`
+    # :   Replaced by the children's system CPU time, as reported by Tms#cstime
+    # `%t`
+    # :   Replaced by the total CPU time, as reported by Tms#total
+    # `%r`
+    # :   Replaced by the elapsed real time, as reported by Tms#real
+    # `%n`
+    # :   Replaced by the label string, as reported by Tms#label (Mnemonic: n of
+    #     "*n*ame")
+    #
+    #
+    # If `format` is not given, FORMAT is used as default value, detailing the user,
+    # system and real elapsed time.
+    #
+    def format: (?String format, *untyped args) -> String
+
+    # Label
+    #
+    def label: () -> String
+
+    # Elapsed real time
+    #
+    def real: () -> Float
+
+    # System CPU time
+    #
+    def stime: () -> Float
+
+    # Returns a new 6-element array, consisting of the label, user CPU time, system
+    # CPU time, children's user CPU time, children's system CPU time and elapsed
+    # real time.
+    #
+    def to_a: () -> untyped
+
+    # Same as #format.
+    #
+    def to_s: () -> String
+
+    # Total time, that is `utime` + `stime` + `cutime` + `cstime`
+    #
+    def total: () -> Float
+
+    # User CPU time
+    #
+    def utime: () -> Float
+
+    # Default caption, see also Benchmark::CAPTION
+    #
+    CAPTION: String
+
+    # Default format string, see also Benchmark::FORMAT
+    #
+    FORMAT: String
+  end
 end
-
-# Default caption, see also Benchmark::CAPTION
-#
-Benchmark::Tms::CAPTION: String
-
-# Default format string, see also Benchmark::FORMAT
-#
-Benchmark::Tms::FORMAT: String