nobu	2017-05-07 00:14:58 +0900 (Sun, 07 May 2017)

  New Revision: 58584

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=58584

  Log:
    ripper/lexer.rb: nested indented heredoc
    
    * ext/ripper/lib/ripper/lexer.rb (on_heredoc_dedent): insert
      stripped leading spaces as `on_ignored_sp` elements, so that the
      original source can be reconsructed.
      [ruby-core:80977] [Bug #13536]

  Modified files:
    trunk/ext/ripper/lib/ripper/lexer.rb
    trunk/test/ripper/test_lexer.rb
    trunk/test/ripper/test_scanner_events.rb
Index: ext/ripper/lib/ripper/lexer.rb
===================================================================
--- ext/ripper/lib/ripper/lexer.rb	(revision 58583)
+++ ext/ripper/lib/ripper/lexer.rb	(revision 58584)
@@ -66,13 +66,20 @@ class Ripper https://github.com/ruby/ruby/blob/trunk/ext/ripper/lib/ripper/lexer.rb#L66
     private
 
     def on_heredoc_dedent(v, w)
-      @buf.last.each do |e|
+      ignored_sp = []
+      heredoc = @buf.last
+      heredoc.each_with_index do |e, i|
         if Elem === e and e.event == :on_tstring_content
+          tok = e.tok.dup if w > 0 and /\A\s/ =~ e.tok
           if (n = dedent_string(e.tok, w)) > 0
+            ignored_sp << [i, Elem.new(e.pos.dup, :on_ignored_sp, tok[0, n])]
             e.pos[1] += n
           end
         end
       end
+      ignored_sp.reverse_each do |i, e|
+        heredoc[i, 0] = [e]
+      end
       v
     end
 
Index: test/ripper/test_scanner_events.rb
===================================================================
--- test/ripper/test_scanner_events.rb	(revision 58583)
+++ test/ripper/test_scanner_events.rb	(revision 58584)
@@ -105,6 +105,7 @@ class TestRipper::ScannerEvents < Test:: https://github.com/ruby/ruby/blob/trunk/test/ripper/test_scanner_events.rb#L105
                  Ripper.lex("1r\n2i\n3ri\n4.2r\n5.6ri")
      assert_equal [[[1, 0], :on_heredoc_beg, "<<~EOS"],
                    [[1, 6], :on_nl, "\n"],
+                   [[2, 0], :on_ignored_sp, "  "],
                    [[2, 2], :on_tstring_content, "heredoc\n"],
                    [[3, 0], :on_heredoc_end, "EOS"]
                  ],
Index: test/ripper/test_lexer.rb
===================================================================
--- test/ripper/test_lexer.rb	(revision 58583)
+++ test/ripper/test_lexer.rb	(revision 58584)
@@ -20,5 +20,16 @@ class TestRipper::Lexer < Test::Unit::Te https://github.com/ruby/ruby/blob/trunk/test/ripper/test_lexer.rb#L20
     D
     E
     assert_equal(str, Ripper.tokenize(str).join(""), bug)
+
+    str = <<~'E'
+    <<~"D"
+    #{
+    <<~"B"
+      this must be a valid ruby
+    B
+    }
+    D
+    E
+    assert_equal(str, Ripper.tokenize(str).join(""), bug)
   end
 end

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/