shyouhei	2009-02-24 02:43:45 +0900 (Tue, 24 Feb 2009)

  New Revision: 22581

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

  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_6/ChangeLog
    branches/ruby_1_8_6/lib/erb.rb
    branches/ruby_1_8_6/test/erb/test_erb.rb
    branches/ruby_1_8_6/version.h

Index: ruby_1_8_6/ChangeLog
===================================================================
--- ruby_1_8_6/ChangeLog	(revision 22580)
+++ ruby_1_8_6/ChangeLog	(revision 22581)
@@ -1,3 +1,10 @@
+Tue Feb 24 02:41:47 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
+
 Sun Feb 22 22:05:44 2009  Nobuyoshi Nakada  <nobu@r...>
 
 	* eval.c (stack_extend): streamlined rb_thread_restore_context()
Index: ruby_1_8_6/version.h
===================================================================
--- ruby_1_8_6/version.h	(revision 22580)
+++ ruby_1_8_6/version.h	(revision 22581)
@@ -1,15 +1,15 @@
 #define RUBY_VERSION "1.8.6"
-#define RUBY_RELEASE_DATE "2009-02-22"
+#define RUBY_RELEASE_DATE "2009-02-24"
 #define RUBY_VERSION_CODE 186
-#define RUBY_RELEASE_CODE 20090222
-#define RUBY_PATCHLEVEL 351
+#define RUBY_RELEASE_CODE 20090224
+#define RUBY_PATCHLEVEL 352
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
 #define RUBY_VERSION_TEENY 6
 #define RUBY_RELEASE_YEAR 2009
 #define RUBY_RELEASE_MONTH 2
-#define RUBY_RELEASE_DAY 22
+#define RUBY_RELEASE_DAY 24
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];
Index: ruby_1_8_6/lib/erb.rb
===================================================================
--- ruby_1_8_6/lib/erb.rb	(revision 22580)
+++ ruby_1_8_6/lib/erb.rb	(revision 22581)
@@ -422,34 +422,6 @@
       end
       Scanner.regist_scanner(SimpleScanner2, nil, false)
 
-      class PercentScanner < Scanner # :nodoc:
-	def scan
-	  new_line = true
-          stag_reg = /(.*?)(<%%|<%=|<%#|<%|\n|\z)/
-          etag_reg = /(.*?)(%%>|%>|\n|\z)/
-          scanner = StringScanner.new(@src)
-          while ! scanner.eos?
-	    if new_line && @stag.nil?
-	      if scanner.scan(/%%/)
-		yield('%')
-		new_line = false
-		next
-	      elsif scanner.scan(/%/)
-		yield(PercentLine.new(scanner.scan(/.*?(\n|\z)/).chomp))
-		next
-	      end
-	    end
-	    scanner.scan(@stag ? etag_reg : stag_reg)
-            text = scanner[1]
-            elem = scanner[2]
-            yield(text) unless text.empty?
-            yield(elem) unless elem.empty?
-	    new_line = (elem == "\n")
-          end
-        end
-      end
-      Scanner.regist_scanner(PercentScanner, nil, true)
-
       class ExplicitScanner < Scanner # :nodoc:
 	def scan
 	  new_line = true
Index: ruby_1_8_6/test/erb/test_erb.rb
===================================================================
--- ruby_1_8_6/test/erb/test_erb.rb	(revision 22580)
+++ ruby_1_8_6/test/erb/test_erb.rb	(revision 22581)
@@ -408,6 +408,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/