rbs 1.7.0.beta.1 → 1.7.0.beta.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6f2e7e51d08feb7b1a562ac43c679da8fc6f0a7cfc2ecef65e11c1e8c3d0d2b9
-  data.tar.gz: d41ed33c0b5de01cd1746faa3572e56f651ecfc808c046cdb4166a0ec357138e
+  metadata.gz: 7a6f33de7616c04fe5e070fe874581fddcd5d6a600371151fe3ff9638669eb89
+  data.tar.gz: f95cb049c9f7231886bfa3ea901d45745a86d9c8c2933bc971b6e09830b00245
 SHA512:
-  metadata.gz: bc198dc7d40caaa802604cb1f633098955540d838c4e1adcca635da85880703378d981a4f37c528e7f4b3720fc6f152d7fc6c7bcb11ce3e0abba76fd14a6d47c
-  data.tar.gz: 68c6643f9adf4761bec2a2ffb211e223cb732a37c341652c4625191b5ab6d6791c91196f3c3bc4fd5624d6d853558c33e28f8462f483f923badad8f38498a675
+  metadata.gz: 71cd7aa025ce3676def36bc814c0fdea25567799ca9b8bcc419fea0c1d75b08fa81d6b5cd568d37e68dce5efce39f0b58007aff1724035c81cadec07fb45f1aa
+  data.tar.gz: 79c51b0a674179e12337b842c3ef6390805b7ce47603efb23ccb96297811524b58b820cc2dcda46b3806df27a598e8bb492d904d530dc7d005861c93674a2eae

data/CHANGELOG.md

@@ -2,11 +2,11 @@
 
 ## master
 
-## 1.7.0 (beta.1)
+## 1.7.0 (beta.2)
 
 ## Library changes
 
-* Replace RBS::Parser ([#788](https://github.com/ruby/rbs/pull/788))
+* Replace RBS::Parser ([#788](https://github.com/ruby/rbs/pull/788), [#789](https://github.com/ruby/rbs/pull/789))
 
 ## 1.6.2 (2021-09-09)
 

data/Rakefile

@@ -9,7 +9,7 @@ ruby = ENV["RUBY"] || RbConfig.ruby
 rbs = File.join(__dir__, "exe/rbs")
 bin = File.join(__dir__, "bin")
 
-Rake::ExtensionTask.new("rbs/extension")
+Rake::ExtensionTask.new("rbs_extension")
 
 Rake::TestTask.new(:test => :compile) do |t|
   t.libs << "test"

data/ext/{rbs/extension → rbs_extension}/extconf.rb

@@ -1,3 +1,3 @@
 require 'mkmf'
 $INCFLAGS << " -I$(top_srcdir)" if $extmk
-create_makefile 'extension'
+create_makefile 'rbs_extension'

data/ext/{rbs/extension → rbs_extension}/main.c

@@ -1,7 +1,7 @@
 #include "rbs_extension.h"
 
 void
-Init_extension(void)
+Init_rbs_extension(void)
 {
   rbs__init_constants();
   rbs__init_location();

data/ext/{rbs/extension → rbs_extension}/parser.c

@@ -1449,6 +1449,7 @@ VALUE parse_member_def(parserstate *state, bool instance_only, bool accept_overl
         parser_advance(state);
         loop = false;
         overload_range = state->current_token.range;
+        member_range.end = overload_range.end;
         break;
       } else {
         raise_syntax_error(
@@ -2280,6 +2281,9 @@ VALUE parse_nested_decl(parserstate *state, const char *nested_in, position anno
   case pCOLON2:
     decl = parse_const_decl(state);
     break;
+  case tGIDENT:
+    decl = parse_global_decl(state);
+    break;
   case kTYPE:
     decl = parse_type_decl(state, annot_pos, annotations);
     break;

data/lib/rbs/errors.rb

@@ -30,6 +30,14 @@ module RBS
 
       super "#{Location.to_string location}: Syntax error: #{error_message}, token=`#{location.source}` (#{token_type})"
     end
+
+    def error_value
+      location.source
+    end
+
+    def token_str
+      token_type
+    end
   end
 
   class InvalidTypeApplicationError < DefinitionError

data/lib/rbs/location_aux.rb

@@ -6,6 +6,19 @@ module RBS
       "#<#{self.class}:#{self.__id__} buffer=#{buffer.name}, start=#{start_line}:#{start_column}, pos=#{start_pos}...#{end_pos}, children=#{(rks + ops).join(",")} source='#{source.lines.first&.chomp}'>"
     end
 
+    def self.new(buffer_ = nil, start_pos_ = nil, end_pos_ = nil, buffer: nil, start_pos: nil, end_pos: nil)
+      __skip__ =
+        begin
+          if buffer && start_pos && end_pos
+            super(buffer, start_pos, end_pos)
+          else
+            super(buffer_, start_pos_, end_pos_)
+          end
+        end
+    end
+
+    WithChildren = self
+
     def name
       buffer.name
     end

data/lib/rbs/parser_aux.rb

@@ -20,5 +20,12 @@ module RBS
         source
       end
     end
+
+    SyntaxError = ParsingError
+    SemanticsError = ParsingError
+    LexerError = ParsingError
+
+    class LocatedValue
+    end
   end
 end

data/lib/rbs/version.rb

@@ -1,3 +1,3 @@
 module RBS
-  VERSION = "1.7.0.beta.1"
+  VERSION = "1.7.0.beta.2"
 end

data/lib/rbs.rb

@@ -46,7 +46,7 @@ require "rbs/locator"
 require "rbs/type_alias_dependency"
 require "rbs/collection"
 
-require "rbs/extension"
+require "rbs_extension"
 require "rbs/parser_aux"
 require "rbs/location_aux"
 

data/rbs.gemspec

@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
   spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features|bin)/}) }
   end
-  spec.extensions = %w{ext/rbs/extension/extconf.rb}
+  spec.extensions = %w{ext/rbs_extension/extconf.rb}
 
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }

data/sig/errors.rbs

@@ -24,6 +24,16 @@ module RBS
     attr_reader token_type: String
 
     def initialize: (Location[untyped, untyped], String error_message, String token_type) -> void
+
+    def error_value: () -> String
+
+    def token_str: () -> String
+  end
+
+  class Parser
+    SemanticsError: singleton(ParsingError)
+    SyntaxError: singleton(ParsingError)
+    LexerError: singleton(ParsingError)
   end
 
   # Error class for errors raised during loading environments.

data/sig/location.rbs

@@ -20,6 +20,9 @@ module RBS
 
     def initialize: (Buffer, Integer start_pos, Integer end_pos) -> void
 
+    def self.new: (Buffer, Integer start_pos, Integer end_pos) -> instance
+                | (buffer: Buffer, start_pos: Integer, end_pos: Integer) -> instance
+
     def inspect: () -> String
 
     # Returns the name of the buffer.
@@ -92,5 +95,7 @@ module RBS
     def _add_optional_no_child: (OptionalChildKeys name) -> void
     def _optional_keys: () -> Array[Symbol]
     def _required_keys: () -> Array[Symbol]
+
+    WithChildren: singleton(Location)
   end
 end

data/sig/parser.rbs

@@ -18,5 +18,8 @@ module RBS
 
     %a{no-defn}
     def self._parse_signature: (Buffer, Integer line, Integer column) -> Array[AST::Declarations::t]
+
+    class LocatedValue
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rbs
 version: !ruby/object:Gem::Version
-  version: 1.7.0.beta.1
+  version: 1.7.0.beta.2
 platform: ruby
 authors:
 - Soutaro Matsumoto
@@ -17,7 +17,7 @@ email:
 executables:
 - rbs
 extensions:
-- ext/rbs/extension/extconf.rb
+- ext/rbs_extension/extconf.rb
 extra_rdoc_files: []
 files:
 - ".github/dependabot.yml"
@@ -98,22 +98,22 @@ files:
 - docs/stdlib.md
 - docs/syntax.md
 - exe/rbs
-- ext/rbs/extension/constants.c
-- ext/rbs/extension/constants.h
-- ext/rbs/extension/extconf.rb
-- ext/rbs/extension/lexer.c
-- ext/rbs/extension/lexer.h
-- ext/rbs/extension/location.c
-- ext/rbs/extension/location.h
-- ext/rbs/extension/main.c
-- ext/rbs/extension/parser.c
-- ext/rbs/extension/parser.h
-- ext/rbs/extension/parserstate.c
-- ext/rbs/extension/parserstate.h
-- ext/rbs/extension/rbs_extension.h
-- ext/rbs/extension/ruby_objs.c
-- ext/rbs/extension/ruby_objs.h
-- ext/rbs/extension/unescape.c
+- ext/rbs_extension/constants.c
+- ext/rbs_extension/constants.h
+- ext/rbs_extension/extconf.rb
+- ext/rbs_extension/lexer.c
+- ext/rbs_extension/lexer.h
+- ext/rbs_extension/location.c
+- ext/rbs_extension/location.h
+- ext/rbs_extension/main.c
+- ext/rbs_extension/parser.c
+- ext/rbs_extension/parser.h
+- ext/rbs_extension/parserstate.c
+- ext/rbs_extension/parserstate.h
+- ext/rbs_extension/rbs_extension.h
+- ext/rbs_extension/ruby_objs.c
+- ext/rbs_extension/ruby_objs.h
+- ext/rbs_extension/unescape.c
 - goodcheck.yml
 - lib/rbs.rb
 - lib/rbs/ancestor_graph.rb