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

* lib/erb.rb (ERB::Compiler::TrimScanner#scan_line): Oops. This

change did not apply to trunk.  Backed out.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@16750 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
knu 2008-06-02 07:15:12 +00:00
parent 92623d3db8
commit 5b7464b047
2 changed files with 9 additions and 6 deletions

View file

@ -1,3 +1,8 @@
Mon Jun 2 16:14:18 2008 Akinori MUSHA <knu@iDaemons.org>
* lib/erb.rb (ERB::Compiler::TrimScanner#scan_line): Oops. This
change did not apply to trunk. Backed out.
Mon Jun 2 16:08:24 2008 Akinori MUSHA <knu@iDaemons.org>
* lib/erb.rb (ERB::Compiler::TrimScanner#scan_line): Fix a bug

View file

@ -329,17 +329,15 @@ class ERB
end
def scan_line(line)
line.split(SplitRegexp).each do |tokens|
tokens.each do |token|
next if token.empty?
yield(token)
end
line.split(SplitRegexp).each do |token|
next if token.empty?
yield(token)
end
end
def trim_line1(line)
line.split(TrimSplitRegexp).each do |token|
next if token.empty?
next if token.empty?
if token == "%>\n"
yield('%>')
yield(:cr)