naruse	2010-06-05 23:15:15 +0900 (Sat, 05 Jun 2010)

  New Revision: 28179

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

  Log:
    merge revision(s) 28104:
    
    * string.c (rb_str_inspect): inspect as ASCII when the codepoint
      of a character in Unicode string is ASCII printable one.

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

Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 28178)
+++ ruby_1_9_2/ChangeLog	(revision 28179)
@@ -1,3 +1,8 @@
+Sat Jun  5 23:14:51 2010  NARUSE, Yui  <naruse@r...>
+
+	* string.c (rb_str_inspect): inspect as ASCII when the codepoint
+	  of a character in Unicode string is ASCII printable one.
+
 Sat Jun  5 15:59:08 2010  Nobuyoshi Nakada  <nobu@r...>
 
 	* ruby.c (process_options, load_file_internal): $0 seen from
Index: ruby_1_9_2/string.c
===================================================================
--- ruby_1_9_2/string.c	(revision 28178)
+++ ruby_1_9_2/string.c	(revision 28179)
@@ -4166,7 +4166,10 @@
 	else {
 	    if (p - n > prev) str_buf_cat(result, prev, p - n - prev);
 	    if (unicode_p) {
-		if (c < 0x10000) {
+		if (c < 0x100 && ISPRINT(c)) {
+		    snprintf(buf, CHAR_ESC_LEN, "%c", c);
+		}
+		else if (c < 0x10000) {
 		    snprintf(buf, CHAR_ESC_LEN, "\\u%04X", c);
 		}
 		else {
Index: ruby_1_9_2/test/ruby/test_m17n.rb
===================================================================
--- ruby_1_9_2/test/ruby/test_m17n.rb	(revision 28178)
+++ ruby_1_9_2/test/ruby/test_m17n.rb	(revision 28179)
@@ -221,6 +221,12 @@
       str = "\u3042\u{10FFFD}"
       assert_equal(Encoding::UTF_8 == e ? %{"#{str}"} : '"\u3042\u{10FFFD}"', str.inspect)
     end
+    Encoding.default_external = Encoding::UTF_8
+    [Encoding::UTF_16BE, Encoding::UTF_16LE, Encoding::UTF_32BE, Encoding::UTF_32LE,
+      Encoding::UTF8_SOFTBANK].each do |e|
+      str = "abc".encode(e)
+      assert_equal('"abc"', str.inspect)
+    end
   ensure
     Encoding.default_internal = orig_int
     Encoding.default_external = orig_ext

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