diff options
author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-07-01 11:51:13 +0000 |
---|---|---|
committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-07-01 11:51:13 +0000 |
commit | 86bb8de8ab7b0e1bfeda1dfaf8e3770152365748 (patch) | |
tree | 6cc80fd43f19369f5d97f718651d7686315bf363 /ext | |
parent | b5b1a2131ec5cbde6adaf0d37953ff05c393218b (diff) |
merge revision(s) 58545,58584: [Backport #13536]
ripper/lexer.rb: nested indented heredoc
* ext/ripper/lib/ripper/lexer.rb (on_heredoc_dedent): fix for
nested indedented here documents, where `Elem`s are nested too.
[ruby-core:80977] [Bug #13536]
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/branches/ruby_2_4@59247 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
-rw-r--r-- | ext/ripper/lib/ripper/lexer.rb | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/ext/ripper/lib/ripper/lexer.rb b/ext/ripper/lib/ripper/lexer.rb index 69526340a7..e70db0b1d1 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| - if e.event == :on_tstring_content + 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 |