nobu	2010-05-28 18:37:06 +0900 (Fri, 28 May 2010)

  New Revision: 28051

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

  Log:
    * string.c (rb_str_inspect): escape ASCII-compatible strings.

  Modified files:
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/string.c
    branches/ruby_1_9_2/test/ruby/test_string.rb
    trunk/ChangeLog
    trunk/string.c
    trunk/test/ruby/test_string.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 28050)
+++ ChangeLog	(revision 28051)
@@ -1,3 +1,7 @@
+Fri May 28 18:37:04 2010  Nobuyoshi Nakada  <nobu@r...>
+
+	* string.c (rb_str_inspect): escape ASCII-compatible strings.
+
 Fri May 28 17:34:48 2010  URABE Shyouhei  <shyouhei@r...>
 
 	* array.c (rb_ary_product): Use tmpary instead, to ensure marking
Index: string.c
===================================================================
--- string.c	(revision 28050)
+++ string.c	(revision 28051)
@@ -4100,6 +4100,7 @@
     VALUE result = rb_str_buf_new(0);
     rb_encoding *resenc = rb_default_internal_encoding();
     int unicode_p = rb_enc_unicode_p(enc);
+    int asciicompat = rb_enc_asciicompat(enc);
 
     if (resenc == NULL) resenc = rb_default_external_encoding();
     if (!rb_enc_asciicompat(resenc)) resenc = rb_usascii_encoding();
@@ -4159,7 +4160,7 @@
 	    continue;
 	}
 	if ((enc == resenc && rb_enc_isprint(c, enc)) ||
-	    (rb_enc_isascii(c, enc) && ISPRINT(c))) {
+	    (asciicompat && rb_enc_isascii(c, enc) && ISPRINT(c))) {
 	    continue;
 	}
 	else {
Index: test/ruby/test_string.rb
===================================================================
--- test/ruby/test_string.rb	(revision 28050)
+++ test/ruby/test_string.rb	(revision 28051)
@@ -1874,4 +1874,11 @@
     assert_equal(s, k, '[ruby-dev:39068]')
     assert_equal(Encoding::UTF_8, k.encoding, '[ruby-dev:39068]')
   end
+
+  def test_ascii_incomat_inspect
+    [Encoding::UTF_16LE, Encoding::UTF_16BE,
+     Encoding::UTF_32LE, Encoding::UTF_32BE].each do |e|
+      assert_equal('"\\u0061\\u0062\\u0063"', "abc".encode(e).inspect)
+    end
+  end
 end
Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 28050)
+++ ruby_1_9_2/ChangeLog	(revision 28051)
@@ -1,3 +1,7 @@
+Fri May 28 18:37:04 2010  Nobuyoshi Nakada  <nobu@r...>
+
+	* string.c (rb_str_inspect): escape ASCII-compatible strings.
+
 Fri May 28 17:34:48 2010  URABE Shyouhei  <shyouhei@r...>
 
 	* array.c (rb_ary_product): Use tmpary instead, to ensure marking
Index: ruby_1_9_2/string.c
===================================================================
--- ruby_1_9_2/string.c	(revision 28050)
+++ ruby_1_9_2/string.c	(revision 28051)
@@ -4100,6 +4100,7 @@
     VALUE result = rb_str_buf_new(0);
     rb_encoding *resenc = rb_default_internal_encoding();
     int unicode_p = rb_enc_unicode_p(enc);
+    int asciicompat = rb_enc_asciicompat(enc);
 
     if (resenc == NULL) resenc = rb_default_external_encoding();
     if (!rb_enc_asciicompat(resenc)) resenc = rb_usascii_encoding();
@@ -4159,7 +4160,7 @@
 	    continue;
 	}
 	if ((enc == resenc && rb_enc_isprint(c, enc)) ||
-	    (rb_enc_isascii(c, enc) && ISPRINT(c))) {
+	    (asciicompat && rb_enc_isascii(c, enc) && ISPRINT(c))) {
 	    continue;
 	}
 	else {
Index: ruby_1_9_2/test/ruby/test_string.rb
===================================================================
--- ruby_1_9_2/test/ruby/test_string.rb	(revision 28050)
+++ ruby_1_9_2/test/ruby/test_string.rb	(revision 28051)
@@ -1874,4 +1874,11 @@
     assert_equal(s, k, '[ruby-dev:39068]')
     assert_equal(Encoding::UTF_8, k.encoding, '[ruby-dev:39068]')
   end
+
+  def test_ascii_incomat_inspect
+    [Encoding::UTF_16LE, Encoding::UTF_16BE,
+     Encoding::UTF_32LE, Encoding::UTF_32BE].each do |e|
+      assert_equal('"\\u0061\\u0062\\u0063"', "abc".encode(e).inspect)
+    end
+  end
 end

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