parser 2.5.0.5 → 2.5.1.0

data/lib/parser/rubymotion.y

@@ -1104,7 +1104,7 @@ rule
                     }
                     bodystmt kEND
                     {
-                      if @context.indirectly_in_def?
+                      unless @context.class_definition_allowed?
                         diagnostic :error, :class_in_def, nil, val[0]
                       end
 
@@ -1139,7 +1139,7 @@ rule
                     }
                     bodystmt kEND
                     {
-                      if @context.indirectly_in_def?
+                      unless @context.module_definition_allowed?
                         diagnostic :error, :module_in_def, nil, val[0]
                       end
 

data/lib/parser/runner.rb

@@ -101,6 +101,11 @@ module Parser
         @parser_class = Parser::Ruby25
       end
 
+      opts.on '--26', 'Parse as Ruby 2.6 would' do
+        require 'parser/ruby26'
+        @parser_class = Parser::Ruby26
+      end
+
       opts.on '--mac', 'Parse as MacRuby 0.12 would' do
         require 'parser/macruby'
         @parser_class = Parser::MacRuby

data/lib/parser/version.rb

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

data/parser.gemspec

@@ -24,6 +24,7 @@ Gem::Specification.new do |spec|
                           lib/parser/ruby23.rb
                           lib/parser/ruby24.rb
                           lib/parser/ruby25.rb
+                          lib/parser/ruby26.rb
                           lib/parser/macruby.rb
                           lib/parser/rubymotion.rb
                        )

data/test/helper.rb

@@ -8,8 +8,19 @@ require 'simplecov'
 if ENV.include?('COVERAGE') && SimpleCov.usable?
   require_relative 'racc_coverage_helper'
 
-  RaccCoverage.start(%w(ruby18.y ruby19.y ruby20.y ruby21.y ruby22.y ruby23.y ruby24.y ruby25.y),
-                     File.expand_path('../../lib/parser', __FILE__))
+  RaccCoverage.start(
+    %w(
+      ruby18.y
+      ruby19.y
+      ruby20.y
+      ruby21.y
+      ruby22.y
+      ruby23.y
+      ruby24.y
+      ruby25.y
+      ruby26.y
+    ),
+    File.expand_path('../../lib/parser', __FILE__))
 
   # Report results faster.
   at_exit { RaccCoverage.stop }

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 mac ios)
+  ALL_VERSIONS = %w(1.8 1.9 2.0 2.1 2.2 2.3 2.4 2.5 2.6 mac ios)
 
   def setup
     @diagnostics = []
@@ -25,6 +25,7 @@ module ParseHelper
     when '2.3' then parser = Parser::Ruby23.new
     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 'mac' then parser = Parser::MacRuby.new
     when 'ios' then parser = Parser::RubyMotion.new
     else raise "Unrecognized Ruby version #{version}"

data/test/test_current.rb

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

data/test/test_lexer.rb

@@ -1944,7 +1944,7 @@ class TestLexer < Minitest::Test
                    :tIDENTIFIER, "a", [0, 1],
                    :tSTAR2,      "*", [2, 3])
 
-    assert_equal :expr_beg, @lex.state
+    assert_equal :expr_value, @lex.state
   end
 
   def test_star2
@@ -1952,7 +1952,7 @@ class TestLexer < Minitest::Test
                    :tIDENTIFIER, "a",  [0, 1],
                    :tPOW,        "**", [2, 4])
 
-    assert_equal :expr_beg, @lex.state
+    assert_equal :expr_value, @lex.state
   end
 
   def test_star2_equals
@@ -3498,4 +3498,40 @@ class TestLexer < Minitest::Test
                    :tIDENTIFIER, 'cond',   [11, 15])
   end
 
+  def test_parser_bug_486
+    setup_lexer(19)
+    assert_scanned(':!@',
+                   :tSYMBOL, '!', [0, 3])
+
+    setup_lexer(19)
+    assert_scanned(':~@',
+                   :tSYMBOL, '~', [0, 3])
+  end
+
+  def test_slash_only_in_heredocs
+    setup_lexer(23)
+    refute_scanned(%Q{<<~E\n\\\nE})
+
+    setup_lexer(23)
+    refute_scanned(%Q{<<-E\n\\\nE})
+  end
+
+  def test_escapes_in_squiggly_heredoc
+    setup_lexer(23)
+
+    assert_scanned(%Q{<<~E\n\a\b\e\f\r\t\\\v\nE},
+                   :tSTRING_BEG,     '<<"',              [0, 4],
+                   :tSTRING_CONTENT, "\a\b\e\f\r\t\v\n", [5, 14],
+                   :tSTRING_END,     'E',                [14, 15],
+                   :tNL,             nil,                [4, 5])
+
+    setup_lexer(23)
+
+    assert_scanned(%Q{<<-E\n\a\b\e\f\r\t\\\v\nE},
+                   :tSTRING_BEG,     '<<"',              [0, 4],
+                   :tSTRING_CONTENT, "\a\b\e\f\r\t\v\n", [5, 14],
+                   :tSTRING_END,     'E',                [14, 15],
+                   :tNL,             nil,                [4, 5])
+  end
+
 end

data/test/test_parser.rb

@@ -27,6 +27,7 @@ class TestParser < Minitest::Test
   SINCE_2_3 = SINCE_2_2 - %w(2.2)
   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)
 
   # Guidelines for test naming:
   #  * Test structure follows structure of AST_FORMAT.md.
@@ -3915,7 +3916,8 @@ class TestParser < Minitest::Test
         s(:args),
         s(:int, 1)),
       %q{f 1, {1 => 2} {1}},
-      %q{})
+      %q{},
+      ALL_VERSIONS - SINCE_2_5)
   end
 
   def test_space_args_arg_call
@@ -4940,7 +4942,8 @@ class TestParser < Minitest::Test
         s(:begin,
           s(:int, 2))),
       %q{begin; else; 2; end},
-      %q{       ~~~~ begin (begin)})
+      %q{       ~~~~ begin (begin)},
+      ALL_VERSIONS - SINCE_2_6)
 
     assert_parses(
       s(:kwbegin,
@@ -4948,7 +4951,8 @@ class TestParser < Minitest::Test
         s(:begin,
           s(:int, 2))),
       %q{begin; 1; else; 2; end},
-      %q{          ~~~~ begin (begin)})
+      %q{          ~~~~ begin (begin)},
+      ALL_VERSIONS - SINCE_2_6)
 
     assert_parses(
       s(:kwbegin,
@@ -4957,12 +4961,20 @@ class TestParser < Minitest::Test
         s(:begin,
           s(:int, 3))),
       %q{begin; 1; 2; else; 3; end},
-      %q{             ~~~~ begin (begin)})
+      %q{             ~~~~ begin (begin)},
+      ALL_VERSIONS - SINCE_2_6)
 
     assert_diagnoses(
       [:warning, :useless_else],
       %q{begin; 1; else; 2; end},
-      %q{          ~~~~ location})
+      %q{          ~~~~ location},
+      ALL_VERSIONS - SINCE_2_6)
+
+    assert_diagnoses(
+      [:error, :useless_else],
+      %q{begin; 1; else; 2; end},
+      %q{          ~~~~ location},
+      SINCE_2_6)
   end
 
   def test_ensure
@@ -6416,9 +6428,9 @@ class TestParser < Minitest::Test
 
   def test_context_cmd_brace_block
     [
-      'tap 1, { 1 => 2 } {',
-      'foo.tap 1, { 1 => 2 } {',
-      'foo::tap 1, { 1 => 2 } {'
+      'tap foo {',
+      'foo.tap foo {',
+      'foo::tap foo {'
     ].each do |code|
       assert_context([:block], code, ALL_VERSIONS)
     end
@@ -6736,7 +6748,7 @@ class TestParser < Minitest::Test
       [:error, :unexpected_token, { :token => 'tLCURLY' }],
       %q{m [] {}},
       %q{     ^ location},
-      SINCE_2_4)
+      SINCE_2_5)
 
     assert_parses(
       s(:block,
@@ -6745,7 +6757,7 @@ class TestParser < Minitest::Test
         s(:args), nil),
       %q{meth[] {}},
       %q{},
-      SINCE_2_4
+      SINCE_2_5
     )
 
     assert_diagnoses_many(
@@ -6842,4 +6854,115 @@ class TestParser < Minitest::Test
       %q{},
       ALL_VERSIONS)
   end
+
+  def test_bug_480
+    assert_parses(
+      s(:send, nil, :m,
+        s(:dstr,
+          s(:begin),
+          s(:begin,
+            s(:begin)))),
+      %q{m "#{}#{()}"},
+      %q{},
+      ALL_VERSIONS)
+  end
+
+  def test_bug_481
+    assert_parses(
+      s(:begin,
+        s(:send, nil, :m,
+          s(:def, :x,
+            s(:args), nil)),
+        s(:block,
+          s(:send,
+            s(:int, 1), :tap),
+          s(:args), nil)),
+      %q{m def x(); end; 1.tap do end},
+      %q{},
+      ALL_VERSIONS)
+  end
+
+  def test_parser_bug_490
+    assert_parses(
+      s(:def, :m,
+        s(:args),
+        s(:sclass,
+          s(:self),
+          s(:class,
+            s(:const, nil, :C), nil, nil))),
+      %q{def m; class << self; class C; end; end; end},
+      %q{},
+      ALL_VERSIONS)
+
+    assert_parses(
+      s(:def, :m,
+        s(:args),
+        s(:sclass,
+          s(:self),
+          s(:module,
+            s(:const, nil, :M), nil))),
+      %q{def m; class << self; module M; end; end; end},
+      %q{},
+      ALL_VERSIONS)
+
+    assert_parses(
+      s(:def, :m,
+        s(:args),
+        s(:sclass,
+          s(:self),
+          s(:casgn, nil, :A,
+            s(:nil)))),
+      %q{def m; class << self; A = nil; end; end},
+      %q{},
+      ALL_VERSIONS)
+  end
+
+  def test_slash_newline_in_heredocs
+    assert_parses(
+      s(:dstr,
+        s(:str, "1 2\n"),
+        s(:str, "3\n")),
+      %Q{<<~E\n    1 \\\n    2\n    3\nE\n},
+      %q{},
+      SINCE_2_3)
+
+    assert_parses(
+      s(:dstr,
+        s(:str, "    1     2\n"),
+        s(:str, "    3\n")),
+      %Q{<<-E\n    1 \\\n    2\n    3\nE\n},
+      %q{},
+      ALL_VERSIONS)
+  end
+
+  def test_ambiuous_quoted_label_in_ternary_operator
+    assert_parses(
+      s(:if,
+        s(:send, nil, :a),
+        s(:send,
+          s(:send, nil, :b), :&,
+          s(:str, '')),
+        s(:nil)),
+      %q{a ? b & '': nil},
+      %q{},
+      ALL_VERSIONS)
+
+    assert_diagnoses(
+      [:error, :unexpected_token, { :token => 'tLABEL_END' }],
+      %q{a ? b | '': nil},
+      %q{         ^~ location},
+      SINCE_2_2)
+
+    assert_diagnoses(
+      [:error, :unexpected_token, { :token => 'tTILDE' }],
+      %q{a ? b ~ '': nil},
+      %q{      ^ location},
+      SINCE_2_2)
+
+    assert_diagnoses(
+      [:error, :unexpected_token, { :token => 'tBANG' }],
+      %q{a ? b ! '': nil},
+      %q{      ^ location},
+      SINCE_2_2)
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: parser
 version: !ruby/object:Gem::Version
-  version: 2.5.0.5
+  version: 2.5.1.0
 platform: ruby
 authors:
 - whitequark
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-24 00:00:00.000000000 Z
+date: 2018-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ast
@@ -216,6 +216,8 @@ files:
 - lib/parser/ruby24.y
 - lib/parser/ruby25.rb
 - lib/parser/ruby25.y
+- lib/parser/ruby26.rb
+- lib/parser/ruby26.y
 - lib/parser/rubymotion.rb
 - lib/parser/rubymotion.y
 - lib/parser/runner.rb