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 | 5b7464b047069a71cd37ea5f86b5f86c3d009702 (patch) | |
tree | 6b83a479c36ef865a90480173efc6ff84744e870 /lib/erb.rb | |
parent | 92623d3db8446d3033716af1ea85146a06b119ff (diff) | |
download | ruby-5b7464b047069a71cd37ea5f86b5f86c3d009702.tar.gz |
* 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
Diffstat (limited to 'lib/erb.rb')
-rw-r--r-- | lib/erb.rb | 10 |
1 files changed, 4 insertions, 6 deletions
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) |