shyouhei	2008-07-10 18:43:07 +0900 (Thu, 10 Jul 2008)

  New Revision: 18002

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=18002

  Log:
    merge revision(s) 17881:
    * lib/erb.rb (PercentScanner#scan): fix %% line bug. [ruby-core:17491]
    * test/erb/test_erb.rb (test_percent): ditto.

  Modified files:
    branches/ruby_1_8_7/ChangeLog
    branches/ruby_1_8_7/lib/erb.rb
    branches/ruby_1_8_7/test/erb/test_erb.rb
    branches/ruby_1_8_7/version.h

Index: ruby_1_8_7/ChangeLog
===================================================================
--- ruby_1_8_7/ChangeLog	(revision 18001)
+++ ruby_1_8_7/ChangeLog	(revision 18002)
@@ -1,3 +1,9 @@
+Thu Jul 10 18:42:37 2008  Masatoshi SEKI  <m_seki@m...>
+
+	* lib/erb.rb (PercentScanner#scan): fix %% line bug. [ruby-core:17491]
+
+	* test/erb/test_erb.rb (test_percent): ditto.
+
 Thu Jul 10 18:40:22 2008  Nobuyoshi Nakada  <nobu@r...>
 
 	* lib/net/ftp.rb (Net::FTP#sendport): use divmod.  [ruby-core:17557]
Index: ruby_1_8_7/version.h
===================================================================
--- ruby_1_8_7/version.h	(revision 18001)
+++ ruby_1_8_7/version.h	(revision 18002)
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2008-07-10"
 #define RUBY_VERSION_CODE 187
 #define RUBY_RELEASE_CODE 20080710
-#define RUBY_PATCHLEVEL 53
+#define RUBY_PATCHLEVEL 54
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
Index: ruby_1_8_7/lib/erb.rb
===================================================================
--- ruby_1_8_7/lib/erb.rb	(revision 18001)
+++ ruby_1_8_7/lib/erb.rb	(revision 18002)
@@ -427,7 +427,7 @@
       Scanner.regist_scanner(SimpleScanner2, nil, false)
 
       class PercentScanner < Scanner # :nodoc:
-	def scan
+	def scan(&blk)
           stag_reg = /(.*?)(^%%|^%|<%%|<%=|<%#|<%|\z)/m
           etag_reg = /(.*?)(%%>|%>|\z)/m
           scanner = StringScanner.new(@src)
@@ -437,13 +437,26 @@
 
             elem = scanner[2]
             if elem == '%%'
-              elem = '%'
+              yield('%')
+              inline_scan(scanner.scan(/.*?(\n|\z)/), &blk)
             elsif elem == '%'
-              elem = PercentLine.new(scanner.scan(/.*?(\n|\z)/).chomp)
+              yield(PercentLine.new(scanner.scan(/.*?(\n|\z)/).chomp))
+            else
+              yield(elem)
             end
-            yield(elem)
           end
         end
+
+        def inline_scan(line)
+          stag_reg = /(.*?)(<%%|<%=|<%#|<%|\z)/m
+          etag_reg = /(.*?)(%%>|%>|\z)/m
+          scanner = StringScanner.new(line)
+          while ! scanner.eos?
+            scanner.scan(@stag ? etag_reg : stag_reg)
+            yield(scanner[1])
+            yield(scanner[2])
+          end
+        end
       end
       Scanner.regist_scanner(PercentScanner, nil, true)
 
Index: ruby_1_8_7/test/erb/test_erb.rb
===================================================================
--- ruby_1_8_7/test/erb/test_erb.rb	(revision 18001)
+++ ruby_1_8_7/test/erb/test_erb.rb	(revision 18002)
@@ -209,11 +209,13 @@
 n.times do |i|%>
 %% %%><%%<%= i%><%
 end%>
+%%%
 EOS
     ans = <<EOS
 % 
 % %%><%0
 % %%><%1
+%%
 EOS
     assert_equal(ans, ERB.new(src, nil, '%').result)
   end

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