* 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

ChangeLog

@@ -1,3 +1,12 @@
+Mon Jun  2 16:08:24 2008  Akinori MUSHA  <knu@iDaemons.org>
+
+	* 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().
+
 Mon Jun  2 13:06:38 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* mkconfig.rb: hide build path from rbconfig.rb.

lib/erb.rb

@@ -329,11 +329,13 @@ class ERB
       end
 
       def scan_line(line)
-	line.split(SplitRegexp).each do |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|

test/erb/test_erb.rb

@@ -54,16 +54,16 @@ class TestERBCore < Test::Unit::TestCase
 
   def _test_core(safe)
     erb = @erb.new("hello")
-    assert_equal(erb.result, "hello")
+    assert_equal("hello", erb.result)
 
     erb = @erb.new("hello", safe, 0)
-    assert_equal(erb.result, "hello")
+    assert_equal("hello", erb.result)
 
     erb = @erb.new("hello", safe, 1)
-    assert_equal(erb.result, "hello")
+    assert_equal("hello", erb.result)
 
     erb = @erb.new("hello", safe, 2)
-    assert_equal(erb.result, "hello")
+    assert_equal("hello", erb.result)
 
     src = <<EOS
 %% hi
@@ -159,7 +159,7 @@ EOS
 
   def test_safe_04
     erb = @erb.new('<%=$SAFE%>', 4)
-    assert_equal(erb.result(TOPLEVEL_BINDING.taint), '4')
+    assert_equal('4', erb.result(TOPLEVEL_BINDING.taint))
   end
 
   class Foo; end