shyouhei	2009-02-24 02:44:50 +0900 (Tue, 24 Feb 2009)

  New Revision: 22583

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

  Log:
    merge revision(s) 21432:
    * lib/erb.rb (PercentScanner): remove PercentScanner. fixed % after
      %> bug. [ruby-dev:37751] [Bug #997] 
    * test/erb/test_erb.rb: 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 22582)
+++ ruby_1_8_7/ChangeLog	(revision 22583)
@@ -1,3 +1,10 @@
+Tue Feb 24 02:44:39 2009  Masatoshi SEKI  <m_seki@m...>
+
+	* lib/erb.rb (PercentScanner): remove PercentScanner. fixed % after
+	  %> bug. [ruby-dev:37751] [Bug #997] 
+
+	* test/erb/test_erb.rb: ditto
+
 Tue Feb 24 02:35:29 2009  Nobuyoshi Nakada  <nobu@r...>
 
 	* hash.c (rb_hash_s_create): set nil as the value if assoc length
Index: ruby_1_8_7/version.h
===================================================================
--- ruby_1_8_7/version.h	(revision 22582)
+++ ruby_1_8_7/version.h	(revision 22583)
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2009-02-24"
 #define RUBY_VERSION_CODE 187
 #define RUBY_RELEASE_CODE 20090224
-#define RUBY_PATCHLEVEL 140
+#define RUBY_PATCHLEVEL 141
 
 #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 22582)
+++ ruby_1_8_7/lib/erb.rb	(revision 22583)
@@ -426,40 +426,6 @@
       end
       Scanner.regist_scanner(SimpleScanner2, nil, false)
 
-      class PercentScanner < Scanner # :nodoc:
-	def scan(&blk)
-          stag_reg = /(.*?)(^%%|^%|<%%|<%=|<%#|<%|\z)/m
-          etag_reg = /(.*?)(%%>|%>|\z)/m
-          scanner = StringScanner.new(@src)
-          while ! scanner.eos?
-	    scanner.scan(@stag ? etag_reg : stag_reg)
-            yield(scanner[1])
-
-            elem = scanner[2]
-            if elem == '%%'
-              yield('%')
-              inline_scan(scanner.scan(/.*?(\n|\z)/), &blk)
-            elsif elem == '%'
-              yield(PercentLine.new(scanner.scan(/.*?(\n|\z)/).chomp))
-            else
-              yield(elem)
-            end
-          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)
-
       class ExplicitScanner < Scanner # :nodoc:
 	def scan
           stag_reg = /(.*?)(^[ \t]*<%-|<%%|<%=|<%#|<%-|<%|\z)/m
Index: ruby_1_8_7/test/erb/test_erb.rb
===================================================================
--- ruby_1_8_7/test/erb/test_erb.rb	(revision 22582)
+++ ruby_1_8_7/test/erb/test_erb.rb	(revision 22583)
@@ -410,6 +410,10 @@
    assert_equal(ans, ERB.new(src, nil, '-').result)
    assert_equal(ans, ERB.new(src, nil, '-%').result)
   end
+
+  def test_percent_after_etag
+    assert_equal("1%", @erb.new("<%= 1 %>%", nil, "%").result)
+  end
 end
 
 class TestERBCoreWOStrScan < TestERBCore

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