nobu	2010-05-28 18:39:41 +0900 (Fri, 28 May 2010)

  New Revision: 28052

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

  Log:
    * string.c (sym_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_symbol.rb
    trunk/ChangeLog
    trunk/string.c
    trunk/test/ruby/test_symbol.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 28051)
+++ ChangeLog	(revision 28052)
@@ -1,5 +1,7 @@
-Fri May 28 18:37:04 2010  Nobuyoshi Nakada  <nobu@r...>
+Fri May 28 18:39:38 2010  Nobuyoshi Nakada  <nobu@r...>
 
+	* string.c (sym_inspect): escape ASCII-compatible strings.
+
 	* string.c (rb_str_inspect): escape ASCII-compatible strings.
 
 Fri May 28 17:34:48 2010  URABE Shyouhei  <shyouhei@r...>
Index: string.c
===================================================================
--- string.c	(revision 28051)
+++ string.c	(revision 28052)
@@ -7063,18 +7063,30 @@
     VALUE str;
     ID id = SYM2ID(sym);
     rb_encoding *enc;
+    const char *ptr;
+    long len;
+    char *dest;
 
     sym = rb_id2str(id);
     enc = STR_ENC_GET(sym);
-    str = rb_enc_str_new(0, RSTRING_LEN(sym)+1, enc);
-    RSTRING_PTR(str)[0] = ':';
-    memcpy(RSTRING_PTR(str)+1, RSTRING_PTR(sym), RSTRING_LEN(sym));
-    if (RSTRING_LEN(sym) != (long)strlen(RSTRING_PTR(sym)) ||
-	!rb_enc_symname_p(RSTRING_PTR(sym), enc) ||
-	!sym_printable(RSTRING_PTR(sym), RSTRING_END(sym), enc)) {
-	str = rb_str_inspect(str);
-	memcpy(RSTRING_PTR(str), ":\"", 2);
+    ptr = RSTRING_PTR(sym);
+    len = RSTRING_LEN(sym);
+    if (!rb_enc_asciicompat(enc) || len != (long)strlen(ptr) ||
+	!rb_enc_symname_p(ptr, enc) || !sym_printable(ptr, ptr + len, enc)) {
+	str = rb_str_inspect(sym);
+	len = RSTRING_LEN(str);
+	rb_str_resize(str, len + 1);
+	dest = RSTRING_PTR(str);
+	memmove(dest + 1, dest, len);
+	dest[0] = ':';
     }
+    else {
+	char *dest;
+	str = rb_enc_str_new(0, len + 1, enc);
+	dest = RSTRING_PTR(str);
+	dest[0] = ':';
+	memcpy(dest + 1, ptr, len);
+    }
     return str;
 }
 
Index: test/ruby/test_symbol.rb
===================================================================
--- test/ruby/test_symbol.rb	(revision 28051)
+++ test/ruby/test_symbol.rb	(revision 28052)
@@ -136,4 +136,11 @@
   def test_symbol_poped
     assert_nothing_raised { eval('a = 1; :"#{ a }"; 1') }
   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).to_sym.inspect)
+    end
+  end
 end
Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 28051)
+++ ruby_1_9_2/ChangeLog	(revision 28052)
@@ -1,5 +1,7 @@
-Fri May 28 18:37:04 2010  Nobuyoshi Nakada  <nobu@r...>
+Fri May 28 18:39:38 2010  Nobuyoshi Nakada  <nobu@r...>
 
+	* string.c (sym_inspect): escape ASCII-compatible strings.
+
 	* string.c (rb_str_inspect): escape ASCII-compatible strings.
 
 Fri May 28 17:34:48 2010  URABE Shyouhei  <shyouhei@r...>
Index: ruby_1_9_2/string.c
===================================================================
--- ruby_1_9_2/string.c	(revision 28051)
+++ ruby_1_9_2/string.c	(revision 28052)
@@ -7063,18 +7063,30 @@
     VALUE str;
     ID id = SYM2ID(sym);
     rb_encoding *enc;
+    const char *ptr;
+    long len;
+    char *dest;
 
     sym = rb_id2str(id);
     enc = STR_ENC_GET(sym);
-    str = rb_enc_str_new(0, RSTRING_LEN(sym)+1, enc);
-    RSTRING_PTR(str)[0] = ':';
-    memcpy(RSTRING_PTR(str)+1, RSTRING_PTR(sym), RSTRING_LEN(sym));
-    if (RSTRING_LEN(sym) != (long)strlen(RSTRING_PTR(sym)) ||
-	!rb_enc_symname_p(RSTRING_PTR(sym), enc) ||
-	!sym_printable(RSTRING_PTR(sym), RSTRING_END(sym), enc)) {
-	str = rb_str_inspect(str);
-	memcpy(RSTRING_PTR(str), ":\"", 2);
+    ptr = RSTRING_PTR(sym);
+    len = RSTRING_LEN(sym);
+    if (!rb_enc_asciicompat(enc) || len != (long)strlen(ptr) ||
+	!rb_enc_symname_p(ptr, enc) || !sym_printable(ptr, ptr + len, enc)) {
+	str = rb_str_inspect(sym);
+	len = RSTRING_LEN(str);
+	rb_str_resize(str, len + 1);
+	dest = RSTRING_PTR(str);
+	memmove(dest + 1, dest, len);
+	dest[0] = ':';
     }
+    else {
+	char *dest;
+	str = rb_enc_str_new(0, len + 1, enc);
+	dest = RSTRING_PTR(str);
+	dest[0] = ':';
+	memcpy(dest + 1, ptr, len);
+    }
     return str;
 }
 
Index: ruby_1_9_2/test/ruby/test_symbol.rb
===================================================================
--- ruby_1_9_2/test/ruby/test_symbol.rb	(revision 28051)
+++ ruby_1_9_2/test/ruby/test_symbol.rb	(revision 28052)
@@ -136,4 +136,11 @@
   def test_symbol_poped
     assert_nothing_raised { eval('a = 1; :"#{ a }"; 1') }
   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).to_sym.inspect)
+    end
+  end
 end

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