diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/erb.rb | 10 |
2 files changed, 9 insertions, 6 deletions
@@ -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 diff --git a/lib/erb.rb b/lib/erb.rb index 58f98ca00f..fade2c72ba 100644 --- a/lib/erb.rb +++ b/lib/erb.rb @@ -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) |