diff options
| author | knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-02 07:15:12 +0000 |
|---|---|---|
| committer | knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-02 07:15:12 +0000 |
| commit | d8061a674996198955420dee0f19947ba7e6e317 (patch) | |
| tree | 6b83a479c36ef865a90480173efc6ff84744e870 | |
| parent | 16d65fd118e9053bb0b2ff3f958f3c6509c2ac38 (diff) | |
| download | ruby-d8061a674996198955420dee0f19947ba7e6e317.tar.gz ruby-d8061a674996198955420dee0f19947ba7e6e317.tar.xz ruby-d8061a674996198955420dee0f19947ba7e6e317.zip | |
* lib/erb.rb (ERB::Compiler::TrimScanner#scan_line): Oops. This
change did not apply to trunk. Backed out.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@16750 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -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 58f98ca00..fade2c72b 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) |