diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-12-11 19:03:26 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-12-11 19:03:26 +0000 |
| commit | 2b79366f5243fad65ad13005e12e78c88d3a95ba (patch) | |
| tree | 513a1c0788e84f999c1039f56216ce6c48bd4e14 | |
| parent | c19f9a508f50ee6c813b2b4f7908c95b6fd9e3c3 (diff) | |
* string.c (rb_str_inspect): fix: extra back slash is added when
the string is dummy encoding and includes \x22 or \x5C.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30180 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | string.c | 5 | ||||
| -rw-r--r-- | test/ruby/test_string.rb | 5 |
3 files changed, 13 insertions, 2 deletions
@@ -1,3 +1,8 @@ +Sun Dec 12 04:01:58 2010 NARUSE, Yui <naruse@ruby-lang.org> + + * string.c (rb_str_inspect): fix: extra back slash is added when + the string is dummy encoding and includes \x22 or \x5C. + Sun Dec 12 02:42:24 2010 Aaron Patterson <aaron@tenderlovemaking.com> * ext/openssl/ossl_asn1.c: indefinite length BER to DER encoding is @@ -4251,12 +4251,13 @@ rb_str_inspect(VALUE str) n = MBCLEN_CHARFOUND_LEN(n); c = rb_enc_mbc_to_codepoint(p, pend, enc); p += n; - if (c == '"'|| c == '\\' || + if ((asciicompat || unicode_p) && + (c == '"'|| c == '\\' || (c == '#' && p < pend && MBCLEN_CHARFOUND_P(rb_enc_precise_mbclen(p,pend,enc)) && (cc = rb_enc_codepoint(p,pend,enc), - (cc == '$' || cc == '@' || cc == '{')))) { + (cc == '$' || cc == '@' || cc == '{'))))) { if (p - n > prev) str_buf_cat(result, prev, p - n - prev); str_buf_cat2(result, "\\"); if (asciicompat || enc == resenc) { diff --git a/test/ruby/test_string.rb b/test/ruby/test_string.rb index 16a6905667..972f326ab2 100644 --- a/test/ruby/test_string.rb +++ b/test/ruby/test_string.rb @@ -1917,6 +1917,11 @@ class TestString < Test::Unit::TestCase assert_equal('"abc\\"\\\\"', i, bug4081) end + def test_dummy_inspect + assert_equal('"\e\x24\x42\x22\x4C\x22\x68\e\x28\x42"', + "\u{ffe2}\u{2235}".encode("cp50220").inspect) + end + def test_prepend assert_equal(S("hello world!"), "world!".prepend("hello ")) |