1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* string.c (sym_inspect): Escape when the symbol is not

Browse Source 
resulted encoding and not ascii_only. It had escaped
  ascii-incompatible string, but it is wrong.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28176 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2010-06-05 11:31:58 +00:00
parent 291809f473
commit 0d49737b4f
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
Sat Jun 5 01:20:14 2010 NARUSE, Yui <naruse@ruby-lang.org>
* string.c (sym_inspect): Escape when the symbol is not
resulted encoding and not ascii_only. It had escaped
ascii-incompatible string, but it is wrong.
Sat Jun 5 01:10:12 2010 NARUSE, Yui <naruse@ruby-lang.org> Sat Jun 5 01:10:12 2010 NARUSE, Yui <naruse@ruby-lang.org>
* string.c (rb_str_buf_cat_escaped_char): defined. * string.c (rb_str_buf_cat_escaped_char): defined.

4
string.c
View File

@ -7078,12 +7078,14 @@ sym_inspect(VALUE sym)
const char *ptr; const char *ptr;
long len; long len;
char *dest; char *dest;
rb_encoding *resenc = rb_default_internal_encoding();
if (resenc == NULL) resenc = rb_default_external_encoding();
sym = rb_id2str(id); sym = rb_id2str(id);
enc = STR_ENC_GET(sym); enc = STR_ENC_GET(sym);
ptr = RSTRING_PTR(sym); ptr = RSTRING_PTR(sym);
len = RSTRING_LEN(sym); len = RSTRING_LEN(sym);
if (!rb_enc_asciicompat(enc) || len != (long)strlen(ptr) || if ((resenc != enc && !rb_str_is_ascii_only_p(sym)) || len != (long)strlen(ptr) ||
!rb_enc_symname_p(ptr, enc) || !sym_printable(ptr, ptr + len, enc)) { !rb_enc_symname_p(ptr, enc) || !sym_printable(ptr, ptr + len, enc)) {
str = rb_str_inspect(sym); str = rb_str_inspect(sym);
len = RSTRING_LEN(str); len = RSTRING_LEN(str);