rbs 0.10.0 → 0.13.0

data/lib/rbs/environment.rb

@@ -13,14 +13,15 @@ module RBS
       def context
         @context ||= begin
                        (outer + [decl]).each.with_object([Namespace.root]) do |decl, array|
-                         array.unshift(array.first + decl.name.to_namespace)
+                         first = array.first or raise 
+                         array.unshift(first + decl.name.to_namespace)
                        end
                      end
       end
     end
 
     class MultiEntry
-      D = Struct.new(:decl, :outer, keyword_init: true) do
+      D = _ = Struct.new(:decl, :outer, keyword_init: true) do
         include ContextUtil
       end
 
@@ -40,6 +41,8 @@ module RBS
       def validate_type_params
         unless decls.empty?
           hd_decl, *tl_decls = decls
+          raise unless hd_decl
+
           hd_params = hd_decl.decl.type_params
           hd_names = hd_params.params.map(&:name)
 
@@ -56,6 +59,10 @@ module RBS
       def type_params
         primary.decl.type_params
       end
+
+      def primary
+        raise "Not implemented"
+      end
     end
 
     class ModuleEntry < MultiEntry
@@ -68,7 +75,7 @@ module RBS
       def primary
         @primary ||= begin
                        validate_type_params
-                       decls.first
+                       decls.first or raise("decls cannot be empty")
                      end
       end
     end
@@ -77,7 +84,7 @@ module RBS
       def primary
         @primary ||= begin
                        validate_type_params
-                       decls.find {|d| d.decl.super_class } || decls.first
+                       decls.find {|d| d.decl.super_class } || decls.first or raise("decls cannot be empty")
                      end
       end
     end
@@ -154,15 +161,17 @@ module RBS
 
         case
         when decl.is_a?(AST::Declarations::Module) && existing_entry.is_a?(ModuleEntry)
-          # OK
+          # @type var existing_entry: ModuleEntry
+          # @type var decl: AST::Declarations::Module
+          existing_entry.insert(decl: decl, outer: outer)
         when decl.is_a?(AST::Declarations::Class) && existing_entry.is_a?(ClassEntry)
-          # OK
+          # @type var existing_entry: ClassEntry
+          # @type var decl: AST::Declarations::Class
+          existing_entry.insert(decl: decl, outer: outer)
         else
           raise DuplicatedDeclarationError.new(name, decl, existing_entry.primary.decl)
         end
 
-        existing_entry.insert(decl: decl, outer: outer)
-
         prefix = outer + [decl]
         ns = name.to_namespace
         decl.each_decl do |d|
@@ -211,6 +220,7 @@ module RBS
 
     def resolve_declaration(resolver, decl, outer:, prefix:)
       if decl.is_a?(AST::Declarations::Global)
+        # @type var decl: AST::Declarations::Global
         return AST::Declarations::Global.new(
           name: decl.name,
           type: absolute_type(resolver, decl.type, context: [Namespace.root]),
@@ -220,7 +230,8 @@ module RBS
       end
 
       context = (outer + [decl]).each.with_object([Namespace.root]) do |decl, array|
-        array.unshift(array.first + decl.name.to_namespace)
+        head = array.first or raise
+        array.unshift(head + decl.name.to_namespace)
       end
 
       case decl
@@ -247,6 +258,8 @@ module RBS
                 outer: outer_,
                 prefix: prefix_
               )
+            else
+              raise
             end
           end,
           location: decl.location,
@@ -277,6 +290,8 @@ module RBS
                 outer: outer_,
                 prefix: prefix_
               )
+            else
+              raise
             end
           end,
           location: decl.location,
@@ -310,6 +325,9 @@ module RBS
           location: decl.location,
           comment: decl.comment
         )
+
+      else
+        raise
       end
     end
 
@@ -325,7 +343,6 @@ module RBS
           comment: member.comment,
           overload: member.overload?,
           annotations: member.annotations,
-          attributes: member.attributes,
           location: member.location
         )
       when AST::Members::AttrAccessor
@@ -410,7 +427,7 @@ module RBS
     end
 
     def absolute_type(resolver, type, context:)
-      type.map_type_name do |name|
+      type.map_type_name do |name, _, _|
         absolute_type_name(resolver, name, context: context)
       end
     end

data/lib/rbs/environment_loader.rb

@@ -9,14 +9,14 @@ module RBS
       end
     end
 
-    LibraryPath = Struct.new(:name, :path, keyword_init: true)
-    GemPath = Struct.new(:name, :version, :path, keyword_init: true)
+    LibraryPath = _ = Struct.new(:name, :path, keyword_init: true)
+    GemPath = _ = Struct.new(:name, :version, :path, keyword_init: true)
 
     attr_reader :paths
     attr_reader :stdlib_root
     attr_reader :gem_vendor_path
 
-    STDLIB_ROOT = Pathname(__dir__) + "../../stdlib"
+    STDLIB_ROOT = Pathname(_ = __dir__) + "../../stdlib"
 
     def self.gem_sig_path(name, version)
       Pathname(Gem::Specification.find_by_name(name, version).gem_dir) + "sig"
@@ -50,22 +50,20 @@ module RBS
     end
 
     def self.parse_library(lib)
-      lib.split(/:/)
+      _ = lib.split(/:/)
     end
 
     def stdlib?(name)
-      if stdlib_root
-        path = stdlib_root + name
-        if path.directory?
-          path
-        end
+      path = stdlib_root + name
+      if path.directory?
+        path
       end
     end
 
     def gem?(name, version)
-      if gem_vendor_path
+      if path = gem_vendor_path
         # Try vendored RBS first
-        gem_dir = gem_vendor_path + name
+        gem_dir = path + name
         if gem_dir.directory?
           return gem_dir
         end
@@ -75,29 +73,16 @@ module RBS
       self.class.gem_sig_path(name, version)
     end
 
-    def each_signature(path = nil, immediate: true, &block)
-      if block_given?
-        if path
-          case
-          when path.file?
-            if path.extname == ".rbs" || immediate
-              yield path
-            end
-          when path.directory?
-            path.children.each do |child|
-              each_signature child, immediate: false, &block
-            end
+    def each_signature(path, immediate: true, &block)
+      if block
+        case
+        when path.file?
+          if path.extname == ".rbs" || immediate
+            yield path
           end
-        else
-          paths.each do |path|
-            case path
-            when Pathname
-              each_signature path, immediate: immediate, &block
-            when LibraryPath
-              each_signature path.path, immediate: immediate, &block
-            when GemPath
-              each_signature path.path, immediate: immediate, &block
-            end
+        when path.directory?
+          path.children.each do |child|
+            each_signature child, immediate: false, &block
           end
         end
       else
@@ -105,32 +90,67 @@ module RBS
       end
     end
 
-    def no_builtin!
-      @no_builtin = true
+    def each_library_path
+      paths.each do |path|
+        case path
+        when Pathname
+          yield path, path
+        when LibraryPath
+          yield path, path.path
+        when GemPath
+          yield path, path.path
+        end
+      end
+    end
+
+    def no_builtin!(skip = true)
+      @no_builtin = skip
+      self
     end
 
     def no_builtin?
       @no_builtin
     end
 
-    def load(env:)
-      signature_files = []
+    def each_decl
+      if block_given?
+        # @type var signature_files: Array[[path | :stdlib, Pathname]]
+        signature_files = []
 
-      unless no_builtin?
-        signature_files.push(*each_signature(stdlib_root + "builtin"))
-      end
+        unless no_builtin?
+          each_signature(stdlib_root + "builtin") do |path|
+            signature_files << [:stdlib, path]
+          end
+        end
+
+        each_library_path do |library_path, pathname|
+          each_signature(pathname) do |path|
+            signature_files << [library_path, path]
+          end
+        end
 
-      each_signature do |path|
-        signature_files.push path
+        signature_files.each do |lib_path, file_path|
+          buffer = Buffer.new(name: file_path.to_s, content: file_path.read)
+          Parser.parse_signature(buffer).each do |decl|
+            yield decl, buffer, file_path, lib_path
+          end
+        end
+      else
+        enum_for :each_decl
       end
+    end
+
+    def load(env:)
+      # @type var loadeds: Array[[AST::Declarations::t, Pathname, path | :stdlib]]
+      loadeds = []
 
-      signature_files.each do |file|
-        buffer = Buffer.new(name: file.to_s, content: file.read)
+      each_decl do |decl, buffer, file_path, lib_path|
         env.buffers.push(buffer)
-        Parser.parse_signature(buffer).each do |decl|
-          env << decl
-        end
+        env << decl
+        loadeds << [decl, file_path, lib_path]
       end
+
+      loadeds
     end
   end
 end

data/lib/rbs/location.rb

@@ -43,7 +43,7 @@ module RBS
     end
 
     def source
-      @source ||= buffer.content[start_pos...end_pos]
+      @source ||= buffer.content[start_pos...end_pos] or raise
     end
 
     def to_s
@@ -73,10 +73,6 @@ module RBS
       end
     end
 
-    def self.concat(*locations)
-      locations.inject {|l1, l2| l1 + l2 }
-    end
-
     def concat(*others)
       others.each { |other| self << other }
       self

data/lib/rbs/method_type.rb

@@ -93,7 +93,7 @@ module RBS
     end
 
     def each_type(&block)
-      if block_given?
+      if block
         type.each_type(&block)
         self.block&.yield_self do |b|
           b.type.each_type(&block)
@@ -105,10 +105,10 @@ module RBS
 
     def to_s
       s = case
-          when block && block.required
-            "(#{type.param_to_s}) { (#{block.type.param_to_s}) -> #{block.type.return_to_s} } -> #{type.return_to_s}"
-          when block
-            "(#{type.param_to_s}) ?{ (#{block.type.param_to_s}) -> #{block.type.return_to_s} } -> #{type.return_to_s}"
+          when (b = block) && b.required
+            "(#{type.param_to_s}) { (#{b.type.param_to_s}) -> #{b.type.return_to_s} } -> #{type.return_to_s}"
+          when b = block
+            "(#{type.param_to_s}) ?{ (#{b.type.param_to_s}) -> #{b.type.return_to_s} } -> #{type.return_to_s}"
           else
             "(#{type.param_to_s}) -> #{type.return_to_s}"
           end

data/lib/rbs/namespace.rb

@@ -63,7 +63,9 @@ module RBS
     end
 
     def split
-      [parent, path.last]
+      last = path.last or return
+      parent = self.parent
+      [parent, last]
     end
 
     def to_s
@@ -77,6 +79,10 @@ module RBS
 
     def to_type_name
       parent, name = split
+
+      raise unless name
+      raise unless parent
+
       TypeName.new(name: name, namespace: parent)
     end
 
@@ -88,14 +94,13 @@ module RBS
       end
     end
 
-
     def ascend
       if block_given?
         current = self
 
         until current.empty?
           yield current
-          current = current.parent
+          current = _ = current.parent 
         end
 
         yield current
@@ -107,3 +112,9 @@ module RBS
     end
   end
 end
+
+module Kernel
+  def Namespace(name)
+    RBS::Namespace.parse(name)
+  end
+end

data/lib/rbs/parser.y

@@ -435,14 +435,6 @@ rule
   method_member:
       annotations attributes overload kDEF method_kind def_name method_types {
         location = val[3].location + val[6].last.location
-        types = val[6].map do |type|
-          case type
-          when LocatedValue
-            type.value
-          else
-            type
-          end
-        end
 
         last_type = val[6].last
         if last_type.is_a?(LocatedValue) && last_type.value == :dot3
@@ -458,16 +450,14 @@ rule
           types: val[6],
           annotations: val[0],
           location: location,
-          comment: leading_comment(val[0].first&.location || val[1].first&.location || val[2]&.location || val[3].location),
-          attributes: val[1].map(&:value),
+          comment: leading_comment(val[0].first&.location || val[2]&.location || val[3].location),
           overload: overload || !!val[2]
         )
       }
 
   attributes:
-      { result = [] }
     | attributes kINCOMPATIBLE {
-        result = val[0].push(val[1])
+        RBS.logger.warn "`incompatible` method attribute is deprecated and ignored."
       }
 
   method_kind:

data/lib/rbs/prototype/rb.rb

@@ -36,7 +36,7 @@ module RBS
           tokens.each.with_object({}) do |token, hash|
             if token[1] == :on_comment
               line = token[0][0]
-              body = token[2][2..]
+              body = token[2][2..-1]
 
               body = "\n" if body.empty?
 
@@ -130,7 +130,6 @@ module RBS
               types: types,
               kind: kind,
               comment: comments[node.first_lineno - 1],
-              attributes: [],
               overload: false
             )
 
@@ -354,7 +353,6 @@ module RBS
           Types::Bases::Nil.new(location: nil)
         when :LIT
           lit = node.children[0]
-          name = lit.class.name
           case lit
           when Symbol
             if lit.match?(/\A[ -~]+\z/)
@@ -365,7 +363,7 @@ module RBS
           when Integer
             Types::Literal.new(literal: lit, location: nil)
           else
-            type_name = TypeName.new(name: name, namespace: Namespace.root)
+            type_name = TypeName.new(name: lit.class.name.to_sym, namespace: Namespace.root)
             Types::ClassInstance.new(name: type_name, args: [], location: nil)
           end
         when :ZLIST, :ZARRAY
@@ -421,7 +419,7 @@ module RBS
 
         types = types.map do |t|
           if t.is_a?(Types::Literal)
-            type_name = TypeName.new(name: t.literal.class.name, namespace: Namespace.root)
+            type_name = TypeName.new(name: t.literal.class.name.to_sym, namespace: Namespace.root)
             Types::ClassInstance.new(name: type_name, args: [], location: nil)
           else
             t