yugui	2009-08-09 00:31:35 +0900 (Sun, 09 Aug 2009)

  New Revision: 24457

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

  Log:
    merges r24342 and r24348 from trunk into ruby_1_9_1.
    --
     Can't use singlebyte optimization when the replacement is multibyte. [ruby-core:24612]
     * string.c (tr_trans): can't use singlebyte optimization when
              the replacement is multibyte. [ruby-core:24612]
    --
    * string.c (tr_trans): change condition of singlebyte optimization.

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/string.c
    branches/ruby_1_9_1/version.h

Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 24456)
+++ ruby_1_9_1/ChangeLog	(revision 24457)
@@ -1,3 +1,13 @@
+Sat Aug  1 19:23:27 2009  NARUSE, Yui  <naruse@r...>
+
+	* string.c (tr_trans): change condition of singlebyte
+	  optimization.
+
+Sat Aug  1 05:18:36 2009  NARUSE, Yui  <naruse@r...>
+
+	* string.c (tr_trans): can't use singlebyte optimization when
+	  the replacement is multibyte. [ruby-core:24612]
+
 Fri Jul 31 16:28:33 2009  NARUSE, Yui  <naruse@r...>
 
 	* io.c (rb_stdio_set_default_encoding): added.
Index: ruby_1_9_1/string.c
===================================================================
--- ruby_1_9_1/string.c	(revision 24456)
+++ ruby_1_9_1/string.c	(revision 24457)
@@ -4681,7 +4681,7 @@
 	    if (r == errc) r = trrepl.now;
 	    if (c < 256) {
 		trans[c] = r;
-		if (r > 255) singlebyte = 0;
+		if (rb_enc_codelen(r, enc) != 1) singlebyte = 0;
 	    }
 	    else {
 		if (!hash) hash = rb_hash_new();
Index: ruby_1_9_1/version.h
===================================================================
--- ruby_1_9_1/version.h	(revision 24456)
+++ ruby_1_9_1/version.h	(revision 24457)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.1"
-#define RUBY_PATCHLEVEL 261
+#define RUBY_PATCHLEVEL 262
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1

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