knu	2008-06-02 16:15:12 +0900 (Mon, 02 Jun 2008)

  New Revision: 16750

  Modified files:
    trunk/ChangeLog
    trunk/lib/erb.rb

  Log:
    * lib/erb.rb (ERB::Compiler::TrimScanner#scan_line): Oops.  This
      change did not apply to trunk.  Backed out.


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=16750&r2=16749&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/lib/erb.rb?r1=16750&r2=16749&diff_format=u

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 16749)
+++ ChangeLog	(revision 16750)
@@ -1,3 +1,8 @@
+Mon Jun  2 16:14:18 2008  Akinori MUSHA  <knu@i...>
+
+	* 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@i...>
 
 	* lib/erb.rb (ERB::Compiler::TrimScanner#scan_line): Fix a bug
Index: lib/erb.rb
===================================================================
--- lib/erb.rb	(revision 16749)
+++ lib/erb.rb	(revision 16750)
@@ -329,17 +329,15 @@
       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)

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/