parser 2.4.0.0 → 2.4.0.1

data/lib/parser/rubymotion.y

@@ -7,7 +7,7 @@ token kCLASS kMODULE kDEF kUNDEF kBEGIN kRESCUE kENSURE kEND kIF kUNLESS
       kUNTIL_MOD kRESCUE_MOD kALIAS kDEFINED klBEGIN klEND k__LINE__
       k__FILE__ k__ENCODING__ tIDENTIFIER tFID tGVAR tIVAR tCONSTANT
       tLABEL tCVAR tNTH_REF tBACK_REF tSTRING_CONTENT tINTEGER tFLOAT
-      tUPLUS tUMINUS tUMINUS_NUM tPOW tCMP tEQ tEQQ tNEQ
+      tUPLUS tUMINUS tUNARY_NUM tPOW tCMP tEQ tEQQ tNEQ
       tGEQ tLEQ tANDOP tOROP tMATCH tNMATCH tDOT tDOT2 tDOT3 tAREF
       tASET tLSHFT tRSHFT tCOLON2 tCOLON3 tOP_ASGN tASSOC tLPAREN
       tLPAREN2 tRPAREN tLPAREN_ARG tLBRACK tLBRACK2 tRBRACK tLBRACE
@@ -21,7 +21,7 @@ token kCLASS kMODULE kDEF kUNDEF kBEGIN kRESCUE kENSURE kEND kIF kUNLESS
 prechigh
   right    tBANG tTILDE tUPLUS
   right    tPOW
-  right    tUMINUS_NUM tUMINUS
+  right    tUNARY_NUM tUMINUS
   left     tSTAR2 tDIVIDE tPERCENT
   left     tPLUS tMINUS
   left     tLSHFT tRSHFT
@@ -646,14 +646,14 @@ rule
                     {
                       result = @builder.binary_op(val[0], val[1], val[2])
                     }
-                | tUMINUS_NUM tINTEGER tPOW arg
+                | tUNARY_NUM tINTEGER tPOW arg
                     {
                       result = @builder.unary_op(val[0],
                                   @builder.binary_op(
                                     @builder.integer(val[1]),
                                       val[2], val[3]))
                     }
-                | tUMINUS_NUM tFLOAT tPOW arg
+                | tUNARY_NUM tFLOAT tPOW arg
                     {
                       result = @builder.unary_op(val[0],
                                   @builder.binary_op(
@@ -1762,15 +1762,25 @@ regexp_contents: # nothing
                     {
                       result = @builder.float(val[0])
                     }
-                | tUMINUS_NUM tINTEGER =tLOWEST
+                | tUNARY_NUM tINTEGER =tLOWEST
                     {
-                      result = @builder.negate(val[0],
-                                  @builder.integer(val[1]))
+                      num = @builder.integer(val[1])
+                      if @builder.respond_to? :negate
+                        # AST builder interface compatibility
+                        result = @builder.negate(val[0], num)
+                      else
+                        result = @builder.unary_num(val[0], num)
+                      end
                     }
-                | tUMINUS_NUM tFLOAT   =tLOWEST
+                | tUNARY_NUM tFLOAT   =tLOWEST
                     {
-                      result = @builder.negate(val[0],
-                                  @builder.float(val[1]))
+                      num = @builder.float(val[1])
+                      if @builder.respond_to? :negate
+                        # AST builder interface compatibility
+                        result = @builder.negate(val[0], num)
+                      else
+                        result = @builder.unary_num(val[0], num)
+                      end
                     }
 
         variable: tIDENTIFIER

data/lib/parser/runner.rb

@@ -94,6 +94,11 @@ module Parser
         @parser_class = Parser::Ruby24
       end
 
+      opts.on '--25', 'Parse as Ruby 2.5 would' do
+        require 'parser/ruby25'
+        @parser_class = Parser::Ruby25
+      end
+
       opts.on '--mac', 'Parse as MacRuby 0.12 would' do
         require 'parser/macruby'
         @parser_class = Parser::MacRuby

data/lib/parser/runner/ruby_rewrite.rb

@@ -32,7 +32,7 @@ module Parser
     def load_and_discover(file)
       load file
 
-      const_name = file.
+      const_name = File.basename(file).
         sub(/\.rb$/, '').
         gsub(/(^|_)([a-z])/) do |m|
           "#{$2.upcase}"

data/lib/parser/source/buffer.rb

@@ -54,7 +54,7 @@ module Parser
         string =~ /\A(.*)\n?(.*\n)?/
         first_line, second_line = $1, $2
 
-        if first_line =~ /\A\xef\xbb\xbf/ # BOM
+        if first_line.start_with?("\xef\xbb\xbf".freeze) # BOM
           return Encoding::UTF_8
         elsif first_line[0, 2] == '#!'.freeze
           encoding_line = second_line

data/lib/parser/source/comment.rb

@@ -72,10 +72,9 @@ module Parser
       # @return [Symbol]
       #
       def type
-        case text
-        when /^#/
+        if text.start_with?("#".freeze)
           :inline
-        when /^=begin/
+        elsif text.start_with?("=begin".freeze)
           :document
         end
       end

data/lib/parser/source/comment/associator.rb

@@ -184,9 +184,16 @@ module Parser
         advance_comment
       end
 
+      MAGIC_COMMENT_RE = /^#\s*(-\*-|)\s*(frozen_string_literal|warn_indent|warn_past_scope):.*\1$/
+
       def advance_through_directives
         # Skip shebang.
-        if @current_comment && @current_comment.text =~ /^#!/
+        if @current_comment && @current_comment.text.start_with?('#!'.freeze)
+          advance_comment
+        end
+
+        # Skip magic comments.
+        if @current_comment && @current_comment.text =~ MAGIC_COMMENT_RE
           advance_comment
         end
 

data/lib/parser/source/rewriter.rb

@@ -42,6 +42,10 @@ module Parser
 
         @insert_before_multi_order = 0
         @insert_after_multi_order = 0
+
+        @pending_queue = nil
+        @pending_clobber = nil
+        @pending_insertions = nil
       end
 
       ##

data/lib/parser/version.rb

@@ -1,3 +1,3 @@
 module Parser
-  VERSION = '2.4.0.0'
+  VERSION = '2.4.0.1'
 end

data/parser.gemspec

@@ -22,6 +22,7 @@ Gem::Specification.new do |spec|
                           lib/parser/ruby22.rb
                           lib/parser/ruby23.rb
                           lib/parser/ruby24.rb
+                          lib/parser/ruby25.rb
                           lib/parser/macruby.rb
                           lib/parser/rubymotion.rb
                        )
@@ -29,18 +30,18 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^test/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency             'ast',       '~> 2.2'
+  spec.add_dependency             'ast',       '~> 2.3'
 
-  spec.add_development_dependency 'bundler',   '~> 1.2'
+  spec.add_development_dependency 'bundler',   '~> 1.16'
   spec.add_development_dependency 'rake',      '~> 10.0'
   spec.add_development_dependency 'racc',      '= 1.4.14'
-  spec.add_development_dependency 'cliver',    '~> 0.3.0'
+  spec.add_development_dependency 'cliver',    '~> 0.3.2'
 
   spec.add_development_dependency 'yard'
   spec.add_development_dependency 'kramdown'
 
-  spec.add_development_dependency 'minitest',  '~> 5.0'
-  spec.add_development_dependency 'simplecov', '~> 0.8.2'
+  spec.add_development_dependency 'minitest',  '~> 5.10'
+  spec.add_development_dependency 'simplecov', '~> 0.15.1'
 
   spec.add_development_dependency 'gauntlet'
 end

data/test/helper.rb

@@ -7,7 +7,7 @@ if ENV.include?('COVERAGE') && SimpleCov.usable?
   if defined?(TracePoint)
     require_relative 'racc_coverage_helper'
 
-    RaccCoverage.start(%w(ruby18.y ruby19.y ruby20.y ruby21.y ruby22.y ruby23.y ruby24.y),
+    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__))
 
     # Report results faster.

data/test/parse_helper.rb

@@ -10,7 +10,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 mac ios)
+    ALL_VERSIONS = %w(1.8 1.9 2.0 2.1 2.2 2.3 2.4 2.5 mac ios)
   end
 
   def setup
@@ -28,6 +28,7 @@ module ParseHelper
     when '2.2' then parser = Parser::Ruby22.new
     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 'mac' then parser = Parser::MacRuby.new
     when 'ios' then parser = Parser::RubyMotion.new
     else raise "Unrecognized Ruby version #{version}"
@@ -98,6 +99,11 @@ module ParseHelper
       raise
     end
 
+    if ast.nil?
+      assert_nil parsed_ast, "(#{version}) AST equality"
+      return
+    end
+
     assert_equal ast, parsed_ast,
                  "(#{version}) AST equality"
 

data/test/racc_coverage_helper.rb

@@ -15,7 +15,7 @@ module RaccCoverage
       @coverage[parser] = extract_interesting_lines(parser, base_path)
     end
 
-    @trace = TracePoint.trace(:line) do |trace|
+    @trace = TracePoint.new(:line) do |trace|
       lineno = trace.lineno - 1
 
       if (line_coverage = @coverage[trace.path])
@@ -24,6 +24,7 @@ module RaccCoverage
         end
       end
     end
+    @trace.enable
   end
 
   def self.stop

data/test/test_base.rb

@@ -23,7 +23,7 @@ class TestBase < Minitest::Test
 
   def test_loc_dup
     ast = Parser::CurrentRuby.parse('1')
-    assert_equal nil, ast.loc.dup.node
+    assert_nil ast.loc.dup.node
     Parser::AST::Node.new(:root, [], :location => ast.loc)
   end
 end

data/test/test_current.rb

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

data/test/test_encoding.rb

@@ -13,7 +13,7 @@ class TestEncoding < Minitest::Test
     require 'parser/all'
 
     def test_default
-      assert_equal nil, recognize('foobar')
+      assert_nil recognize('foobar')
     end
 
     def test_bom
@@ -38,16 +38,16 @@ class TestEncoding < Minitest::Test
     end
 
     def test_empty
-      assert_equal nil, recognize('')
+      assert_nil recognize('')
     end
 
     def test_no_comment
-      assert_equal nil, recognize(%{require 'cane/encoding_aware_iterator'})
+      assert_nil recognize(%{require 'cane/encoding_aware_iterator'})
     end
 
     def test_adjacent
-      assert_equal nil, recognize('# codingkoi8-r')
-      assert_equal nil, recognize('# coding koi8-r')
+      assert_nil recognize('# codingkoi8-r')
+      assert_nil recognize('# coding koi8-r')
     end
 
     def test_utf8_mac
@@ -60,7 +60,7 @@ class TestEncoding < Minitest::Test
       assert_equal Encoding::UTF_8, recognize('# coding: utf-8-mac')
 
       assert_raises(ArgumentError) do
-        assert_equal nil,           recognize('# coding: utf-8-dicks')
+        assert_nil recognize('# coding: utf-8-dicks')
       end
     end
 

data/test/test_lexer.rb

@@ -178,13 +178,14 @@ class TestLexer < Minitest::Test
   def test_ambiguous_uminus
     assert_scanned("m -3",
                    :tIDENTIFIER, "m", [0, 1],
-                   :tUMINUS_NUM, "-", [2, 3],
+                   :tUNARY_NUM,  "-", [2, 3],
                    :tINTEGER,    3,   [3, 4])
   end
 
   def test_ambiguous_uplus
     assert_scanned("m +3",
                    :tIDENTIFIER, "m", [0, 1],
+                   :tUNARY_NUM,  "+", [2, 3],
                    :tINTEGER,    3,   [3, 4])
   end
 
@@ -569,16 +570,6 @@ class TestLexer < Minitest::Test
                    :kEND,        "end", [8, 11])
   end
 
-  def test_do_cond
-    @lex.cond.push(true)
-
-    assert_scanned("x do 42 end",
-                   :tIDENTIFIER, "x",   [0, 1],
-                   :kDO_COND,    "do",  [2, 4],
-                   :tINTEGER,    42,    [5, 7],
-                   :kEND,        "end", [8, 11])
-  end
-
   def test_do_block
     @lex.state = :expr_endarg
 
@@ -655,7 +646,13 @@ class TestLexer < Minitest::Test
 
   def test_float_dot_E_neg
     assert_scanned("-1.0E10",
-                   :tUMINUS_NUM, "-",    [0, 1],
+                   :tUNARY_NUM,  "-",    [0, 1],
+                   :tFLOAT,      1.0e10, [1, 7])
+  end
+
+  def test_float_dot_E_pos
+    assert_scanned("+1.0E10",
+                   :tUNARY_NUM,  "+",    [0, 1],
                    :tFLOAT,      1.0e10, [1, 7])
   end
 
@@ -665,7 +662,13 @@ class TestLexer < Minitest::Test
 
   def test_float_dot_e_neg
     assert_scanned("-1.0e10",
-                   :tUMINUS_NUM, "-",    [0, 1],
+                   :tUNARY_NUM,  "-",    [0, 1],
+                   :tFLOAT,      1.0e10, [1, 7])
+  end
+
+  def test_float_dot_e_pos
+    assert_scanned("+1.0e10",
+                   :tUNARY_NUM,  "+",    [0, 1],
                    :tFLOAT,      1.0e10, [1, 7])
   end
 
@@ -683,19 +686,37 @@ class TestLexer < Minitest::Test
 
   def test_float_e_neg
     assert_scanned("-1e10",
-                   :tUMINUS_NUM, "-",  [0, 1],
+                   :tUNARY_NUM,  "-",  [0, 1],
                    :tFLOAT,      1e10, [1, 5])
   end
 
   def test_float_e_neg_minus
     assert_scanned("-1e-10",
-                   :tUMINUS_NUM, "-",   [0, 1],
+                   :tUNARY_NUM,  "-",   [0, 1],
                    :tFLOAT,      1e-10, [1, 6])
   end
 
   def test_float_e_neg_plus
     assert_scanned("-1e+10",
-                   :tUMINUS_NUM, "-",  [0, 1],
+                   :tUNARY_NUM,  "-",  [0, 1],
+                   :tFLOAT,      1e10, [1, 6])
+  end
+
+  def test_float_e_pos
+    assert_scanned("+1e10",
+                   :tUNARY_NUM,  "+",  [0, 1],
+                   :tFLOAT,      1e10, [1, 5])
+  end
+
+  def test_float_e_pos_minus
+    assert_scanned("+1e-10",
+                   :tUNARY_NUM,  "+",   [0, 1],
+                   :tFLOAT,      1e-10, [1, 6])
+  end
+
+  def test_float_e_pos_plus
+    assert_scanned("+1e+10",
+                   :tUNARY_NUM,  "+",  [0, 1],
                    :tFLOAT,      1e10, [1, 6])
   end
 
@@ -727,7 +748,13 @@ class TestLexer < Minitest::Test
 
   def test_float_neg
     assert_scanned("-1.0",
-                   :tUMINUS_NUM, "-", [0, 1],
+                   :tUNARY_NUM,  "-", [0, 1],
+                   :tFLOAT,      1.0, [1, 4])
+  end
+
+  def test_float_pos
+    assert_scanned("+1.0",
+                   :tUNARY_NUM,  "+", [0, 1],
                    :tFLOAT,      1.0, [1, 4])
   end
 
@@ -962,12 +989,14 @@ class TestLexer < Minitest::Test
   end
 
   def test_identifier_eh
+    setup_lexer 19
+
     assert_scanned("identifier?",
                    :tFID,        "identifier?", [0, 11])
 
     assert_scanned("identifier?=",
                    :tIDENTIFIER, "identifier", [0, 10],
-                   :tNEQ,        "?=",         [10, 12])
+                   :tCHARACTER,  "=",          [10, 12])
   end
 
   def test_identifier_cmp
@@ -978,10 +1007,6 @@ class TestLexer < Minitest::Test
     assert_lex_fname "identifier", :tIDENTIFIER, [0, 10]
   end
 
-  def test_identifier_eh
-    assert_scanned("identifier?", :tFID, "identifier?", [0, 11])
-  end
-
   def test_identifier_equals_arrow
     assert_scanned(":blah==>",
                    :tSYMBOL, "blah=", [0, 6],
@@ -1319,10 +1344,16 @@ class TestLexer < Minitest::Test
 
   def test_minus_unary_number
     assert_scanned("-42",
-                   :tUMINUS_NUM, "-", [0, 1],
+                   :tUNARY_NUM,  "-", [0, 1],
                    :tINTEGER,    42,  [1, 3])
   end
 
+  def test_minus_unary_whitespace_number
+    assert_scanned("- 42",
+                   :tUNARY_NUM,  "-", [0, 1],
+                   :tINTEGER,    42,  [2, 4])
+  end
+
   def test_nth_ref
     assert_scanned('[$1, $2, $3]',
                    :tLBRACK,  "[", [0, 1],
@@ -1448,6 +1479,18 @@ class TestLexer < Minitest::Test
     assert_scanned "+@", :tUPLUS, "+@", [0, 2]
   end
 
+  def test_plus_unary_number
+    assert_scanned("+42",
+                   :tUNARY_NUM,  "+", [0, 1],
+                   :tINTEGER,    42,  [1, 3])
+  end
+
+  def test_plus_unary_whitespace_number
+    assert_scanned("+ 42",
+                   :tUNARY_NUM,  "+", [0, 1],
+                   :tINTEGER,    42,  [2, 4])
+  end
+
   def test_numbers
     assert_scanned "0b10", :tINTEGER, 2, [0, 4]
     assert_scanned "0B10", :tINTEGER, 2, [0, 4]
@@ -1492,11 +1535,6 @@ class TestLexer < Minitest::Test
     refute_scanned "1.1end"
   end
 
-  def test_plus_unary_number
-    assert_scanned("+42",
-                   :tINTEGER, 42, [1, 3])
-  end
-
   def test_question__18
     setup_lexer 18
 
@@ -2765,7 +2803,7 @@ class TestLexer < Minitest::Test
     @lex.state = :expr_end
     assert_scanned("\n+ 1",
                    :tNL,      nil, [0, 1],
-                   :tUPLUS,   '+', [1, 2],
+                   :tUNARY_NUM, '+', [1, 2],
                    :tINTEGER, 1,   [3, 4])
 
     @lex.state = :expr_end
@@ -2776,7 +2814,7 @@ class TestLexer < Minitest::Test
     @lex.state = :expr_end
     assert_scanned("#foo\n+ 1",
                    :tNL,      nil, [4, 5],
-                   :tUPLUS,   '+', [5, 6],
+                   :tUNARY_NUM, '+', [5, 6],
                    :tINTEGER, 1,   [7, 8])
   end