From 92623d3db8446d3033716af1ea85146a06b119ff Mon Sep 17 00:00:00 2001 From: knu Date: Mon, 2 Jun 2008 07:10:35 +0000 Subject: * lib/erb.rb (ERB::Compiler::TrimScanner#scan_line): Fix a bug where tokens are not yilelded one by one. * test/erb/test_erb.rb (TestERBCore#_test_01) (TestERBCore#test_02_safe_04): The expected value should come first for assert_equal(). git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@16749 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- lib/erb.rb | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'lib') diff --git a/lib/erb.rb b/lib/erb.rb index fade2c72ba..58f98ca00f 100644 --- a/lib/erb.rb +++ b/lib/erb.rb @@ -329,15 +329,17 @@ class ERB end def scan_line(line) - line.split(SplitRegexp).each do |token| - next if token.empty? - yield(token) + line.split(SplitRegexp).each do |tokens| + tokens.each do |token| + next if token.empty? + yield(token) + end 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) -- cgit v1.2.3