parser 2.7.0.3 → 2.7.1.2

data/test/test_source_range.rb

@@ -169,4 +169,19 @@ class TestSourceRange < Minitest::Test
     assert_equal 1, sr3.begin_pos
     assert_equal 4, sr3.end_pos
   end
+
+  def test_eql_and_hash
+    assert_equal false, @sr1_3.eql?(@sr3_3)
+    assert @sr1_3.hash != @sr3_3.hash
+
+    also_1_3 = @sr3_3.with(begin_pos: 1)
+    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"
+    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
+  end
 end

data/test/test_source_tree_rewriter.rb

@@ -8,8 +8,10 @@ class TestSourceTreeRewriter < Minitest::Test
     @buf.source = 'puts(:hello, :world)'
 
     @hello = range(5, 6)
+    @ll = range(7, 2)
     @comma_space = range(11,2)
     @world = range(13,6)
+    @whole = range(0, @buf.source.length)
   end
 
   def range(from, len)
@@ -17,11 +19,11 @@ class TestSourceTreeRewriter < Minitest::Test
   end
 
   # Returns either:
-  #  - String (Normal operation)
+  #  - yield rewriter
   #  - [diagnostic, ...] (Diagnostics)
   #  - Parser::ClobberingError
   #
-  def apply(actions, **policy)
+  def build(actions, **policy)
     diagnostics = []
     diags = -> { diagnostics.flatten.map(&:strip).join("\n") }
     rewriter = Parser::Source::TreeRewriter.new(@buf, **policy)
@@ -30,7 +32,7 @@ class TestSourceTreeRewriter < Minitest::Test
       rewriter.public_send(action, range, *args)
     end
     if diagnostics.empty?
-      rewriter.process
+      yield rewriter
     else
       diags.call
     end
@@ -38,6 +40,15 @@ class TestSourceTreeRewriter < Minitest::Test
     [::Parser::ClobberingError, diags.call]
   end
 
+  # Returns either:
+  #  - String (Normal operation)
+  #  - [diagnostic, ...] (Diagnostics)
+  #  - Parser::ClobberingError
+  #
+  def apply(actions, **policy)
+    build(actions, **policy) { |rewriter| rewriter.process }
+  end
+
   # Expects ordered actions to be grouped together
   def check_actions(expected, grouped_actions, **policy)
     grouped_actions.permutation do |sequence|
@@ -140,6 +151,16 @@ DIAGNOSTIC
                             [:wrap, @hello, '[', ']']]
   end
 
+  def test_inserts_on_empty_ranges
+    assert_actions_result 'puts({x}:hello[y], :world)',
+      [:insert_before, @hello.begin, '{'],
+      [:replace, @hello.begin, 'x'],
+      [:insert_after, @hello.begin, '}'],
+      [:insert_before, @hello.end, '['],
+      [:replace, @hello.end, 'y'],
+      [:insert_after, @hello.end, ']']
+  end
+
   def test_replace_same_range
     assert_actions_result 'puts(:hey, :world)',
                            [[:replace, @hello, ':hi'],
@@ -170,4 +191,73 @@ DIAGNOSTIC
     rewriter = Parser::Source::TreeRewriter.new(@buf)
     assert_raises(IndexError) { rewriter.insert_before(range(0, 100), 'hola') }
   end
+
+  def test_empty
+    rewriter = Parser::Source::TreeRewriter.new(@buf)
+    assert_equal true, rewriter.empty?
+
+    # This is a trivial wrap
+    rewriter.wrap(range(2,3), '', '')
+    assert_equal true, rewriter.empty?
+
+    # This is a trivial deletion
+    rewriter.remove(range(2,0))
+    assert_equal true, rewriter.empty?
+
+    rewriter.remove(range(2,3))
+    assert_equal false, rewriter.empty?
+  end
+
+  # splits array into two groups, yield all such possible pairs of groups
+  # each_split([1, 2, 3, 4]) yields [1, 2], [3, 4];
+  #                            then [1, 3], [2, 4]
+  #                                 ...
+  #                     and finally [3, 4], [1, 2]
+  def each_split(array)
+    n = array.size
+    first_split_size = n.div(2)
+    splitting = (0...n).to_set
+    splitting.to_a.combination(first_split_size) do |indices|
+      yield array.values_at(*indices),
+            array.values_at(*(splitting - indices))
+    end
+  end
+
+  # Checks that `actions+extra` give the same result when
+  # made in order or from subgroups that are later merged.
+  # The `extra` actions are always added at the end of the second group.
+  #
+  def check_all_merge_possibilities(actions, extra, **policy)
+    expected = apply(actions + extra, **policy)
+
+    each_split(actions) do |actions_1, actions_2|
+      build(actions_1, **policy) do |rewriter_1|
+        build(actions_2 + extra, **policy) do |rewriter_2|
+          result = rewriter_1.merge(rewriter_2).process
+          assert_equal(expected, result,
+            "Group 1: #{actions_1.inspect}\n\n" +
+            "Group 2: #{(actions_2 + extra).inspect}"
+          )
+        end
+      end
+    end
+  end
+
+  def test_merge
+    check_all_merge_possibilities([
+      [:wrap, @whole, '<', '>'],
+      [:replace, @comma_space, ' => '],
+      [:wrap, @hello, '!', '!'],
+      # Following two wraps must have same value as they
+      # will be applied in different orders...
+      [:wrap, @hello.join(@world), '{', '}'],
+      [:wrap, @hello.join(@world), '{', '}'],
+      [:remove, @ll],
+      [:replace, @world, ':everybody'],
+      [:wrap, @world, '[', ']']
+    ],
+    [ # ... but this one is always going to be applied last (extra)
+      [:wrap, @hello.join(@world), '@', '@'],
+    ])
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: parser
 version: !ruby/object:Gem::Version
-  version: 2.7.0.3
+  version: 2.7.1.2
 platform: ruby
 authors:
 - whitequark
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-26 00:00:00.000000000 Z
+date: 2020-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ast
@@ -229,6 +229,8 @@ files:
 - lib/parser/ruby26.y
 - lib/parser/ruby27.rb
 - lib/parser/ruby27.y
+- lib/parser/ruby28.rb
+- lib/parser/ruby28.y
 - lib/parser/rubymotion.rb
 - lib/parser/rubymotion.y
 - lib/parser/runner.rb
@@ -242,6 +244,7 @@ files:
 - lib/parser/source/map/condition.rb
 - lib/parser/source/map/constant.rb
 - lib/parser/source/map/definition.rb
+- lib/parser/source/map/endless_definition.rb
 - lib/parser/source/map/for.rb
 - lib/parser/source/map/heredoc.rb
 - lib/parser/source/map/index.rb
@@ -297,9 +300,9 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/whitequark/parser/issues
-  changelog_uri: https://github.com/whitequark/parser/blob/v2.7.0.3/CHANGELOG.md
-  documentation_uri: https://www.rubydoc.info/gems/parser/2.7.0.3
-  source_code_uri: https://github.com/whitequark/parser/tree/v2.7.0.3
+  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
 post_install_message: 
 rdoc_options: []
 require_paths: