diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-05-28 09:39:41 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-05-28 09:39:41 +0000 |
commit | 5f3f080504a4e35eb5c963cc5af326aaf122e834 (patch) | |
tree | 9193995c8eaa80879d3cb7ce92a3718342ad4158 /string.c | |
parent | 2dfa488b2a7e2f9a859082298fce4e10b426635d (diff) |
* string.c (sym_inspect): escape ASCII-compatible strings.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28052 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'string.c')
-rw-r--r-- | string.c | 28 |
1 files changed, 20 insertions, 8 deletions
@@ -7063,17 +7063,29 @@ sym_inspect(VALUE sym) 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; } |