parser 2.7.1.2 → 2.7.1.3

data/test/test_runner_parse.rb

@@ -7,7 +7,7 @@ class TestRunnerParse < Minitest::Test
   PATH_TO_RUBY_PARSE = File.expand_path('../bin/ruby-parse', __dir__).freeze
 
   def assert_prints(argv, expected_output)
-    stdout, stderr, status = Open3.capture3(PATH_TO_RUBY_PARSE, *argv)
+    stdout, _stderr, status = Open3.capture3(PATH_TO_RUBY_PARSE, *argv)
 
     assert_equal 0, status.to_i
     assert_includes(stdout, expected_output)
@@ -18,6 +18,27 @@ class TestRunnerParse < Minitest::Test
                   's(:int, 123)'
   end
 
+  def test_emit_modern_ruby
+    assert_prints ['-e', '->{}'],
+                  '(lambda)'
+    assert_prints ['-e', 'self[1] = 2'],
+                  'indexasgn'
+  end
+
+  def test_emit_legacy
+    assert_prints ['--legacy', '-e', '->{}'],
+                  '(send nil :lambda)'
+    assert_prints ['--legacy', '-e', 'self[1] = 2'],
+                  ':[]='
+  end
+
+  def test_emit_legacy_lambda
+    assert_prints ['--legacy-lambda', '-e', '->{}'],
+                  '(send nil :lambda)'
+    assert_prints ['--legacy-lambda', '-e', 'self[1] = 2'],
+                  'indexasgn'
+  end
+
   def test_emit_json
     assert_prints ['--emit-json', '-e', '123'],
                   '["int",123]'

data/test/test_runner_rewrite.rb

@@ -21,7 +21,7 @@ class TestRunnerRewrite < Minitest::Test
       expected_file = @fixtures_dir + output
 
       FileUtils.cp(@fixtures_dir + input, sample_file_expanded)
-      stdout, stderr, exit_code = Dir.chdir @test_dir do
+      stdout, stderr, _exit_code = Dir.chdir @test_dir do
         Open3.capture3 %Q{
           #{Shellwords.escape(@ruby_rewrite.to_s)} #{args} \
           #{Shellwords.escape(sample_file_expanded.to_s)}

data/test/test_source_buffer.rb

@@ -20,6 +20,9 @@ class TestSourceBuffer < Minitest::Test
 
     buffer = Parser::Source::Buffer.new('(string)', 5)
     assert_equal 5, buffer.first_line
+
+    buffer = Parser::Source::Buffer.new('(string)', source: '2+2')
+    assert_equal '2+2', buffer.source
   end
 
   def test_source_setter
@@ -45,7 +48,7 @@ class TestSourceBuffer < Minitest::Test
       ].join("\n")
     end
 
-    assert_match /invalid byte sequence in UTF\-8/, error.message
+    assert_match(/invalid byte sequence in UTF\-8/, error.message)
   end
 
   def test_read

data/test/test_source_comment.rb

@@ -4,8 +4,8 @@ require 'helper'
 
 class TestSourceComment < Minitest::Test
   def setup
-    @buf = Parser::Source::Buffer.new('(string)')
-    @buf.source = "# foo\n=begin foo\nbar\n=end baz\n"
+    @buf = Parser::Source::Buffer.new('(string)',
+      source: "# foo\n=begin foo\nbar\n=end baz\n")
   end
 
   def range(s, e)

data/test/test_source_comment_associator.rb

@@ -95,7 +95,7 @@ class Foo
 end
     END
 
-    klass_node         = ast
+    _klass_node        = ast
     method_node        = ast.children[2]
     body               = method_node.children[2]
     f1_1_node          = body.children[0]
@@ -175,7 +175,7 @@ class Foo
 end
     END
 
-    klass_node         = ast
+    _klass_node        = ast
     method_node        = ast.children[2]
     body               = method_node.children[2]
     f1_1_node          = body.children[0]
@@ -201,12 +201,12 @@ end
   end
 
   def test_associate_empty_tree
-    ast, associations = associate("")
+    _ast, associations = associate("")
     assert_equal 0, associations.size
   end
 
   def test_associate_shebang_only
-    ast, associations = associate(<<-END)
+    _ast, associations = associate(<<-END)
 #!ruby
 class Foo
 end
@@ -216,7 +216,7 @@ end
   end
 
   def test_associate_frozen_string_literal
-    ast, associations = associate(<<-END)
+    _ast, associations = associate(<<-END)
 # frozen_string_literal: true
 class Foo
 end
@@ -226,7 +226,7 @@ end
   end
 
   def test_associate_frozen_string_literal_dash_star_dash
-    ast, associations = associate(<<-END)
+    _ast, associations = associate(<<-END)
 # -*- frozen_string_literal: true -*-
 class Foo
 end
@@ -236,7 +236,7 @@ end
   end
 
   def test_associate_frozen_string_literal_no_space_after_colon
-    ast, associations = associate(<<-END)
+    _ast, associations = associate(<<-END)
 # frozen_string_literal:true
 class Foo
 end
@@ -246,7 +246,7 @@ end
   end
 
   def test_associate_warn_indent
-    ast, associations = associate(<<-END)
+    _ast, associations = associate(<<-END)
 # warn_indent: true
 class Foo
 end
@@ -256,7 +256,7 @@ end
   end
 
   def test_associate_warn_indent_dash_star_dash
-    ast, associations = associate(<<-END)
+    _ast, associations = associate(<<-END)
 # -*- warn_indent: true -*-
 class Foo
 end
@@ -266,7 +266,7 @@ end
   end
 
   def test_associate_warn_past_scope
-    ast, associations = associate(<<-END)
+    _ast, associations = associate(<<-END)
 # warn_past_scope: true
 class Foo
 end
@@ -276,7 +276,7 @@ end
   end
 
   def test_associate_warn_past_scope_dash_star_dash
-    ast, associations = associate(<<-END)
+    _ast, associations = associate(<<-END)
 # -*- warn_past_scope: true -*-
 class Foo
 end
@@ -286,7 +286,7 @@ end
   end
 
   def test_associate_multiple
-    ast, associations = associate(<<-END)
+    _ast, associations = associate(<<-END)
 # frozen_string_literal: true; warn_indent: true
 class Foo
 end
@@ -296,7 +296,7 @@ end
   end
 
   def test_associate_multiple_dash_star_dash
-    ast, associations = associate(<<-END)
+    _ast, associations = associate(<<-END)
 # -*- frozen_string_literal: true; warn_indent: true -*-
 class Foo
 end
@@ -306,7 +306,7 @@ end
   end
 
   def test_associate_no_comments
-    ast, associations = associate(<<-END)
+    _ast, associations = associate(<<-END)
 class Foo
 end
     END
@@ -315,7 +315,7 @@ end
   end
 
   def test_associate_comments_after_root_node
-    ast, associations = associate(<<-END)
+    _ast, associations = associate(<<-END)
 class Foo
 end
 # not associated
@@ -364,4 +364,36 @@ x
     assert_equal ['# bar'],
                  associations[send_node].map(&:text)
   end
+
+  def test_associate_conditional_parent_class
+    ast, associations = associate(<<-END)
+class Foo
+  # bar
+  class Bar
+  end
+end if some_condition
+    END
+
+    if_node = ast
+    _condition, foo_class = if_node.children
+    _foo, _sub_class, bar_class = foo_class.children
+
+    assert_equal 1, associations.size
+    assert_equal ['# bar'],
+                 associations[bar_class].map(&:text)
+  end
+
+  def test_children_in_source_order
+    obj = Parser::Source::Comment::Associator.new(nil, nil)
+    for_each_node do |node|
+      with_loc = node.children.select do |child|
+        child.is_a?(AST::Node) && child.loc && child.loc.expression
+      end
+      slow_sort = with_loc.sort_by.with_index do |child, index| # Index to ensure stable sort
+          [child.loc.expression.begin_pos, index]
+      end
+      optimized = obj.send(:children_in_source_order, node)
+      assert_equal slow_sort, optimized, "children_in_source_order incorrect for #{node}"
+    end
+  end
 end

data/test/test_source_map.rb

@@ -7,8 +7,7 @@ class TestSourceMap < Minitest::Test
   include ParseHelper
 
   def test_to_hash
-    buf = Parser::Source::Buffer.new("<input>")
-    buf.source = "1"
+    buf = Parser::Source::Buffer.new("<input>", source: "1")
     ast = parser_for_ruby_version('1.8').parse(buf)
     assert_equal [:expression, :operator], ast.loc.to_hash.keys.sort_by(&:to_s)
   end

data/test/test_source_range.rb

@@ -4,8 +4,8 @@ require 'helper'
 
 class TestSourceRange < Minitest::Test
   def setup
-    @buf = Parser::Source::Buffer.new('(string)')
-    @buf.source = "foobar\nbaz"
+    @buf = Parser::Source::Buffer.new('(string)',
+      source: "foobar\nbaz")
     @sr1_3 = Parser::Source::Range.new(@buf, 1, 3)
     @sr2_2 = Parser::Source::Range.new(@buf, 2, 2)
     @sr3_3 = Parser::Source::Range.new(@buf, 3, 3)
@@ -95,15 +95,15 @@ class TestSourceRange < Minitest::Test
 
   def test_order
     assert_equal  0, @sr1_3 <=> @sr1_3
-    assert_equal -1, @sr1_3 <=> @sr5_8
-    assert_equal -1, @sr2_2 <=> @sr2_6
-    assert_equal +1, @sr2_6 <=> @sr2_2
+    assert_equal(-1, @sr1_3 <=> @sr5_8)
+    assert_equal(-1, @sr2_2 <=> @sr2_6)
+    assert_equal(+1, @sr2_6 <=> @sr2_2)
 
-    assert_equal -1, @sr1_3 <=> @sr2_6
+    assert_equal(-1, @sr1_3 <=> @sr2_6)
 
-    assert_equal +1, @sr2_2 <=> @sr1_3
-    assert_equal -1, @sr1_3 <=> @sr2_2
-    assert_equal -1, @sr5_7 <=> @sr5_8
+    assert_equal(+1, @sr2_2 <=> @sr1_3)
+    assert_equal(-1, @sr1_3 <=> @sr2_2)
+    assert_equal(-1, @sr5_7 <=> @sr5_8)
 
     assert_nil @sr1_3 <=> Parser::Source::Range.new(@buf.dup, 1, 3)
     assert_nil @sr1_3 <=> 4
@@ -155,6 +155,11 @@ class TestSourceRange < Minitest::Test
     refute sr.is?('bar')
   end
 
+  def test_to_range
+    sr = Parser::Source::Range.new(@buf, 10, 20)
+    assert_equal (10...20), sr.to_range
+  end
+
   def test_to_s
     sr = Parser::Source::Range.new(@buf, 8, 9)
     assert_equal '(string):2:2', sr.to_s
@@ -178,8 +183,8 @@ class TestSourceRange < Minitest::Test
     assert_equal true, @sr1_3.eql?(also_1_3)
     assert_equal @sr1_3.hash, also_1_3.hash
 
-    buf2 = Parser::Source::Buffer.new('(string)')
-    buf2.source = "foobar\nbaz"
+    buf2 = Parser::Source::Buffer.new('(string)',
+      source: "foobar\nbaz")
     from_other_buf = Parser::Source::Range.new(buf2, 1, 3)
     assert_equal false, @sr1_3.eql?(from_other_buf)
     assert @sr1_3.hash != from_other_buf.hash

data/test/test_source_rewriter.rb

@@ -4,8 +4,8 @@ require 'helper'
 
 class TestSourceRewriter < Minitest::Test
   def setup
-    @buf = Parser::Source::Buffer.new('(rewriter)')
-    @buf.source = 'foo bar baz'
+    @buf = Parser::Source::Buffer.new('(rewriter)',
+      source: 'foo bar baz')
     Parser::Source::Rewriter.warned_of_deprecation = true
     @rewriter = Parser::Source::Rewriter.new(@buf)
   end
@@ -522,7 +522,7 @@ class TestSourceRewriter < Minitest::Test
       end
     end
 
-    assert_match /nested/i, error.message
+    assert_match(/nested/i, error.message)
   end
 
   def test_process_in_transaction_raises_error
@@ -532,7 +532,7 @@ class TestSourceRewriter < Minitest::Test
       end
     end
 
-    assert_match /transaction/, error.message
+    assert_match(/transaction/, error.message)
   end
 
   def silence_diagnostics

data/test/test_source_rewriter_action.rb

@@ -4,8 +4,8 @@ require 'helper'
 
 class TestSourceRewriterAction < Minitest::Test
   def setup
-    @buf = Parser::Source::Buffer.new('(rewriter_action)')
-    @buf.source = 'foo bar baz'
+    @buf = Parser::Source::Buffer.new('(rewriter_action)',
+      source: 'foo bar baz')
   end
 
   def range(from, len)

data/test/test_source_tree_rewriter.rb

@@ -4,8 +4,8 @@ require 'helper'
 
 class TestSourceTreeRewriter < Minitest::Test
   def setup
-    @buf = Parser::Source::Buffer.new('(rewriter)')
-    @buf.source = 'puts(:hello, :world)'
+    @buf = Parser::Source::Buffer.new('(rewriter)',
+      source: 'puts(:hello, :world)')
 
     @hello = range(5, 6)
     @ll = range(7, 2)
@@ -36,7 +36,7 @@ class TestSourceTreeRewriter < Minitest::Test
     else
       diags.call
     end
-  rescue ::Parser::ClobberingError => e
+  rescue ::Parser::ClobberingError => _e
     [::Parser::ClobberingError, diags.call]
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: parser
 version: !ruby/object:Gem::Version
-  version: 2.7.1.2
+  version: 2.7.1.3
 platform: ruby
 authors:
 - whitequark
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-29 00:00:00.000000000 Z
+date: 2020-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ast
@@ -50,14 +50,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 13.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 13.0.1
 - !ruby/object:Gem::Dependency
   name: racc
   requirement: !ruby/object:Gem::Requirement
@@ -272,6 +272,7 @@ files:
 - test/helper.rb
 - test/parse_helper.rb
 - test/racc_coverage_helper.rb
+- test/test_ast_processor.rb
 - test/test_base.rb
 - test/test_current.rb
 - test/test_diagnostic.rb
@@ -279,6 +280,7 @@ files:
 - test/test_encoding.rb
 - test/test_lexer.rb
 - test/test_lexer_stack_state.rb
+- test/test_meta.rb
 - test/test_parse_helper.rb
 - test/test_parser.rb
 - test/test_runner_parse.rb
@@ -300,9 +302,9 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/whitequark/parser/issues
-  changelog_uri: https://github.com/whitequark/parser/blob/v2.7.1.2/CHANGELOG.md
-  documentation_uri: https://www.rubydoc.info/gems/parser/2.7.1.2
-  source_code_uri: https://github.com/whitequark/parser/tree/v2.7.1.2
+  changelog_uri: https://github.com/whitequark/parser/blob/v2.7.1.3/CHANGELOG.md
+  documentation_uri: https://www.rubydoc.info/gems/parser/2.7.1.3
+  source_code_uri: https://github.com/whitequark/parser/tree/v2.7.1.3
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -329,6 +331,7 @@ test_files:
 - test/helper.rb
 - test/parse_helper.rb
 - test/racc_coverage_helper.rb
+- test/test_ast_processor.rb
 - test/test_base.rb
 - test/test_current.rb
 - test/test_diagnostic.rb
@@ -336,6 +339,7 @@ test_files:
 - test/test_encoding.rb
 - test/test_lexer.rb
 - test/test_lexer_stack_state.rb
+- test/test_meta.rb
 - test/test_parse_helper.rb
 - test/test_parser.rb
 - test/test_runner_parse.rb