1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

* lib/irb/ruby-lex.rb: allow to handle recursive heredocs on

irb[Bug #5648].



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38631 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
keiju 2012-12-27 12:35:28 +00:00
parent 89182621d9
commit 8f4d0c4526
2 changed files with 24 additions and 4 deletions

View file

@ -1,3 +1,8 @@
Thu Dec 27 21:30:21 2012 Keiju Ishitsuka <keiju@ishitsuka.com>
* lib/irb/ruby-lex.rb: allow to handle recursive heredocs on
irb[Bug #5648].
Thu Dec 27 20:45:29 2012 Masaki Matsushita <glass.saga@gmail.com> Thu Dec 27 20:45:29 2012 Masaki Matsushita <glass.saga@gmail.com>
* ext/stringio/stringio.c (strio_getline): fix not to raise TypeError * ext/stringio/stringio.c (strio_getline): fix not to raise TypeError

View file

@ -907,11 +907,26 @@ class RubyLex
end end
@here_header = false @here_header = false
while l = gets # while l = gets
l = l.sub(/(:?\r)?\n\z/, '') # l = l.sub(/(:?\r)?\n\z/, '')
if (indent ? l.strip : l) == quoted # if (indent ? l.strip : l) == quoted
# break
# end
# end
line = ""
while ch = getc
if ch == "\n"
if line == quoted
break break
end end
line = ""
else
line.concat ch unless indent && line == "" && /\s/ =~ ch
if @ltype != "'" && ch == "#" && peek(0) == "{"
identify_string_dvar
end
end
end end
@here_header = true @here_header = true