From 4815e27c7a3b1de095be1a74657d6cf1ba434862 Mon Sep 17 00:00:00 2001 From: yugui Date: Tue, 16 Dec 2008 10:25:58 +0000 Subject: merges r20723 and r20724 from trunk into ruby_1_9_1. * string.c (sym_inspect): quote if symbol contains non-printable characters. [ruby-dev:37398] git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@20790 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 7 +++++++ string.c | 15 ++++++++++++++- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index f36e7dc3b..885341004 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Sat Dec 13 18:34:43 2008 Yukihiro Matsumoto + + * string.c (sym_printable): wrong condition for string iteration. + Sat Dec 13 15:52:27 2008 Yukihiro Matsumoto * string.c (sym_equal): remove documentation error "Otherwise, @@ -53,6 +57,9 @@ Sat Dec 13 16:04:48 2008 Yuki Sonoda (Yugui) loading a locale encoding on some locale. fixed by Nobuyuki Nakada. + * string.c (sym_inspect): quote if symbol contains non-printable + characters. [ruby-dev:37398] + Sat Dec 13 14:24:38 2008 Yuki Sonoda (Yugui) * test/ruby/enc/test_utf16.rb: feature changed in r20626. diff --git a/string.c b/string.c index db5b422b6..1eac1bda3 100644 --- a/string.c +++ b/string.c @@ -6826,6 +6826,18 @@ sym_equal(VALUE sym1, VALUE sym2) } +static int +sym_printable(const char *s, const char *send, rb_encoding *enc) +{ + while (s < send) { + 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 +6860,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), RSTRING_END(sym), enc)) { str = rb_str_inspect(str); strncpy(RSTRING_PTR(str), ":\"", 2); } -- cgit