From 4671737b0f161263f5bd74eb4c76ab5b2cee7099 Mon Sep 17 00:00:00 2001 From: nobu Date: Sat, 6 May 2017 15:14:58 +0000 Subject: 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] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@58584 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ext/ripper/lib/ripper/lexer.rb | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'ext/ripper') diff --git a/ext/ripper/lib/ripper/lexer.rb b/ext/ripper/lib/ripper/lexer.rb index 350b513c25..63dcf85132 100644 --- a/ext/ripper/lib/ripper/lexer.rb +++ b/ext/ripper/lib/ripper/lexer.rb @@ -66,13 +66,20 @@ class Ripper 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 -- cgit v1.2.3