parser 2.6.0.0 → 2.6.2.0

data/lib/parser/runner.rb

@@ -106,6 +106,11 @@ module Parser
         @parser_class = Parser::Ruby26
       end
 
+      opts.on '--27', 'Parse as Ruby 2.7 would' do
+        require 'parser/ruby27'
+        @parser_class = Parser::Ruby27
+      end
+
       opts.on '--mac', 'Parse as MacRuby 0.12 would' do
         require 'parser/macruby'
         @parser_class = Parser::MacRuby

data/lib/parser/tree_rewriter.rb

@@ -27,12 +27,13 @@ module Parser
   #     end
   #     EOF
   #
+  #     ast           = Parser::CurrentRuby.parse code
   #     buffer        = Parser::Source::Buffer.new('(example)')
   #     buffer.source = code
   #     rewriter      = RemoveDo.new
   #
   #     # Rewrite the AST, returns a String with the new form.
-  #     puts rewriter.rewrite(buffer)
+  #     puts rewriter.rewrite(buffer, ast)
   #
   # This would result in the following Ruby code:
   #

data/lib/parser/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Parser
-  VERSION = '2.6.0.0'
+  VERSION = '2.6.2.0'
 end

data/parser.gemspec

@@ -24,6 +24,7 @@ Gem::Specification.new do |spec|
                           lib/parser/ruby24.rb
                           lib/parser/ruby25.rb
                           lib/parser/ruby26.rb
+                          lib/parser/ruby27.rb
                           lib/parser/macruby.rb
                           lib/parser/rubymotion.rb
                        )
@@ -35,7 +36,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency             'ast',       '~> 2.4.0'
 
-  spec.add_development_dependency 'bundler',   '~> 1.15'
+  spec.add_development_dependency 'bundler',   '>= 1.15', '< 3.0.0'
   spec.add_development_dependency 'rake',      '~> 10.0'
   spec.add_development_dependency 'racc',      '= 1.4.14'
   spec.add_development_dependency 'cliver',    '~> 0.3.2'

data/test/parse_helper.rb

@@ -7,7 +7,7 @@ module ParseHelper
   require 'parser/macruby'
   require 'parser/rubymotion'
 
-  ALL_VERSIONS = %w(1.8 1.9 2.0 2.1 2.2 2.3 2.4 2.5 2.6 mac ios)
+  ALL_VERSIONS = %w(1.8 1.9 2.0 2.1 2.2 2.3 2.4 2.5 2.6 2.7 mac ios)
 
   def setup
     @diagnostics = []
@@ -26,6 +26,7 @@ module ParseHelper
     when '2.4' then parser = Parser::Ruby24.new
     when '2.5' then parser = Parser::Ruby25.new
     when '2.6' then parser = Parser::Ruby26.new
+    when '2.7' then parser = Parser::Ruby27.new
     when 'mac' then parser = Parser::MacRuby.new
     when 'ios' then parser = Parser::RubyMotion.new
     else raise "Unrecognized Ruby version #{version}"

data/test/test_current.rb

@@ -20,6 +20,8 @@ class TestCurrent < Minitest::Test
       assert_equal Parser::Ruby25, Parser::CurrentRuby
     when /^2\.6\.\d+/
       assert_equal Parser::Ruby26, Parser::CurrentRuby
+    when /^2\.7\.\d+/
+      assert_equal Parser::Ruby27, Parser::CurrentRuby
     else
       flunk "Update test_current for #{RUBY_VERSION}"
     end

data/test/test_lexer.rb

@@ -3540,4 +3540,45 @@ class TestLexer < Minitest::Test
                    :tIDENTIFIER, 're', [1, 3])
   end
 
+  def test_meth_ref
+    assert_scanned('foo.:bar',
+                  :tIDENTIFIER, 'foo', [0, 3],
+                  :tMETHREF,   '.:',   [3, 5],
+                  :tIDENTIFIER, 'bar', [5, 8])
+
+    assert_scanned('foo .:bar',
+                   :tIDENTIFIER, 'foo', [0, 3],
+                   :tMETHREF,   '.:',   [4, 6],
+                   :tIDENTIFIER, 'bar', [6, 9])
+  end
+
+  def test_meth_ref_unary_op
+    assert_scanned('foo.:+',
+                  :tIDENTIFIER, 'foo', [0, 3],
+                  :tMETHREF,    '.:',  [3, 5],
+                  :tPLUS,       '+',   [5, 6])
+
+    assert_scanned('foo.:-@',
+                  :tIDENTIFIER, 'foo', [0, 3],
+                  :tMETHREF,    '.:',  [3, 5],
+                  :tUMINUS,     '-@',  [5, 7])
+  end
+
+  def test_meth_ref_unsupported_newlines
+    # MRI emits exactly the same sequence of tokens,
+    # the error happens later in the parser
+
+    assert_scanned('foo. :+',
+                  :tIDENTIFIER, 'foo', [0, 3],
+                  :tDOT,        '.',   [3, 4],
+                  :tCOLON,      ':',   [5, 6],
+                  :tUPLUS,       '+',  [6, 7])
+
+    assert_scanned('foo.: +',
+                  :tIDENTIFIER, 'foo', [0, 3],
+                  :tDOT,        '.',   [3, 4],
+                  :tCOLON,      ':',   [4, 5],
+                  :tPLUS,       '+',   [6, 7])
+  end
+
 end

data/test/test_parser.rb

@@ -28,6 +28,7 @@ class TestParser < Minitest::Test
   SINCE_2_4 = SINCE_2_3 - %w(2.3)
   SINCE_2_5 = SINCE_2_4 - %w(2.4)
   SINCE_2_6 = SINCE_2_5 - %w(2.5)
+  SINCE_2_7 = SINCE_2_6 - %w(2.6)
 
   # Guidelines for test naming:
   #  * Test structure follows structure of AST_FORMAT.md.
@@ -7084,4 +7085,36 @@ class TestParser < Minitest::Test
         SINCE_2_0)
     end
   end
+
+  def test_meth_ref
+    assert_parses(
+      s(:meth_ref, s(:lvar, :foo), :bar),
+      %q{foo.:bar},
+      %q{   ^^ dot
+        |     ~~~ selector
+        |~~~~~~~~ expression},
+      SINCE_2_7)
+
+    assert_parses(
+      s(:meth_ref, s(:lvar, :foo), :+@),
+      %q{foo.:+@},
+      %q{   ^^ dot
+        |     ~~ selector
+        |~~~~~~~ expression},
+      SINCE_2_7)
+  end
+
+  def test_meth_ref_unsupported_newlines
+    assert_diagnoses(
+      [:error, :unexpected_token, { :token => 'tCOLON' }],
+      %Q{foo. :+},
+      %q{     ^ location},
+      SINCE_2_7)
+
+    assert_diagnoses(
+      [:error, :unexpected_token, { :token => 'tCOLON' }],
+      %Q{foo.: +},
+      %q{    ^ location},
+      SINCE_2_7)
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: parser
 version: !ruby/object:Gem::Version
-  version: 2.6.0.0
+  version: 2.6.2.0
 platform: ruby
 authors:
 - whitequark
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-16 00:00:00.000000000 Z
+date: 2019-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ast
@@ -28,16 +28,22 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.15'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.15'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -219,6 +225,8 @@ files:
 - lib/parser/ruby25.y
 - lib/parser/ruby26.rb
 - lib/parser/ruby26.y
+- lib/parser/ruby27.rb
+- lib/parser/ruby27.y
 - lib/parser/rubymotion.rb
 - lib/parser/rubymotion.y
 - lib/parser/runner.rb
@@ -299,8 +307,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: A Ruby parser written in pure Ruby.