[前][次][番号順一覧][スレッド一覧]

ruby-changes:4037

From: ko1@a...
Date: Mon, 18 Feb 2008 00:35:26 +0900 (JST)
Subject: [ruby-changes:4037] akr - Ruby:r15527 (trunk): * re.c (rb_reg_regsub): don't repeat repl twice with

akr	2008-02-18 00:35:09 +0900 (Mon, 18 Feb 2008)

  New Revision: 15527

  Modified files:
    trunk/ChangeLog
    trunk/re.c
    trunk/test/ruby/test_regexp.rb

  Log:
    * re.c (rb_reg_regsub): don't repeat repl twice with
      "X".sub!(/./, sprintf("\\%c", 255)).


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=15527&r2=15526&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/test/ruby/test_regexp.rb?r1=15527&r2=15526&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/re.c?r1=15527&r2=15526&diff_format=u

Index: re.c
===================================================================
--- re.c	(revision 15526)
+++ re.c	(revision 15527)
@@ -2985,6 +2985,7 @@
         if (c == -1) {
             s += mbclen(s, e, str_enc);
 	    rb_enc_str_buf_cat(val, ss, s-ss, str_enc);
+            p = s;
 	    continue;
         }
         s += clen;
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 15526)
+++ ChangeLog	(revision 15527)
@@ -1,3 +1,8 @@
+Mon Feb 18 00:33:03 2008  Tanaka Akira  <akr@f...>
+
+	* re.c (rb_reg_regsub): don't repeat repl twice with
+	  "X".sub!(/./, sprintf("\\%c", 255)).
+
 Sun Feb 17 23:06:55 2008  Kazuhiro NISHIYAMA  <zn@m...>
 
 	* lib/cgi.rb (CGI::escapeHTML): use gsub with Hash. [ruby-dev:33828]
Index: test/ruby/test_regexp.rb
===================================================================
--- test/ruby/test_regexp.rb	(revision 15526)
+++ test/ruby/test_regexp.rb	(revision 15527)
@@ -407,7 +407,7 @@
     assert_equal("fooXXXbaz", "foobarbaz".sub!(/bar/, "XXX"))
     s = [0xff].pack("C")
     assert_equal(s, "X".sub!(/./, s))
-    assert_equal('\\' + s + '\\' + s, "X".sub!(/./, '\\' + s)) # ???
+    assert_equal('\\' + s, "X".sub!(/./, '\\' + s))
     assert_equal('\k', "foo".sub!(/.../, '\k'))
     assert_raise(RuntimeError) { "foo".sub!(/(?<x>o)/, '\k<x') }
     assert_equal('foo[bar]baz', "foobarbaz".sub!(/(b..)/, '[\0]'))

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

[前][次][番号順一覧][スレッド一覧]