From 5b7464b047069a71cd37ea5f86b5f86c3d009702 Mon Sep 17 00:00:00 2001 From: knu Date: Mon, 2 Jun 2008 07:15:12 +0000 Subject: [PATCH] * 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 --- ChangeLog | 5 +++++ lib/erb.rb | 10 ++++------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7ddf4c63cc..e20f3ab103 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Mon Jun 2 16:14:18 2008 Akinori MUSHA + + * 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 * 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)