diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-13 08:09:23 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-13 08:09:23 +0000 |
commit | c319ce5ec6fbc8eb1912fc5b9fe34489b11fcec9 (patch) | |
tree | 476d932b4ff397121e3ff40c5c75cc518f06c03f | |
parent | 7eacc663b85fff234e8173f01c319b1804adee41 (diff) | |
download | ruby-c319ce5ec6fbc8eb1912fc5b9fe34489b11fcec9.tar.gz ruby-c319ce5ec6fbc8eb1912fc5b9fe34489b11fcec9.tar.xz ruby-c319ce5ec6fbc8eb1912fc5b9fe34489b11fcec9.zip |
* string.c (sym_inspect): quote if symbol contains non-printable
characters. [ruby-dev:37398]
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@20723 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 3 | ||||
-rw-r--r-- | string.c | 16 |
2 files changed, 18 insertions, 1 deletions
@@ -14,6 +14,9 @@ Sat Dec 13 15:52:27 2008 Yukihiro Matsumoto <matz@ruby-lang.org> * string.c (sym_equal): remove documentation error "Otherwise, compares them as strings". [ruby-dev:37398] + * string.c (sym_inspect): quote if symbol contains non-printable + characters. [ruby-dev:37398] + Sat Dec 13 14:24:38 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp> * test/ruby/enc/test_utf16.rb: feature changed in r20626. @@ -6826,6 +6826,19 @@ sym_equal(VALUE sym1, VALUE sym2) } +static int +sym_printable(const char *s, rb_encoding *enc) +{ + const char *send = s + strlen(s); + while (s) { + int c = rb_enc_codepoint(s, send, enc); + int n = rb_enc_codelen(c, enc); + if (!rb_enc_isprint(c, enc)) return Qfalse; + s += n; + } + return Qtrue; +} + /* * call-seq: * sym.inspect => string @@ -6848,7 +6861,8 @@ sym_inspect(VALUE sym) RSTRING_PTR(str)[0] = ':'; memcpy(RSTRING_PTR(str)+1, RSTRING_PTR(sym), RSTRING_LEN(sym)); if (RSTRING_LEN(sym) != strlen(RSTRING_PTR(sym)) || - !rb_enc_symname_p(RSTRING_PTR(sym), enc)) { + !rb_enc_symname_p(RSTRING_PTR(sym), enc) || + !sym_printable(RSTRING_PTR(sym), enc)) { str = rb_str_inspect(str); strncpy(RSTRING_PTR(str), ":\"", 2); } |