diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | string.c | 2 | ||||
| -rw-r--r-- | test/ruby/test_string.rb | 8 |
3 files changed, 14 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Mon Nov 22 21:30:57 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * string.c (rb_str_inspect): fix for ascii-compatible external + encoding and different encoding string. [ruby-core:33283] + Mon Nov 22 18:45:44 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> * lib/mkmf.rb (create_makefile): should not duplicate rules. @@ -4238,7 +4238,7 @@ rb_str_inspect(VALUE str) (cc == '$' || cc == '@' || cc == '{')))) { if (p - n > prev) str_buf_cat(result, prev, p - n - prev); str_buf_cat2(result, "\\"); - if (enc == resenc) { + if (asciicompat || enc == resenc) { prev = p - n; continue; } diff --git a/test/ruby/test_string.rb b/test/ruby/test_string.rb index 0c75f31311..892aa2335d 100644 --- a/test/ruby/test_string.rb +++ b/test/ruby/test_string.rb @@ -1897,6 +1897,14 @@ class TestString < Test::Unit::TestCase assert_equal('"\\u3042\\u3044\\u3046"', "\u3042\u3044\u3046".encode(e).inspect) assert_equal('"ab\\"c"', "ab\"c".encode(e).inspect, bug4081) end + begin + ext = Encoding.default_external + Encoding.default_external = "us-ascii" + i = "abc\"\\".force_encoding("utf-8").inspect + ensure + Encoding.default_external = ext + end + assert_equal('"abc\\"\\\\"', i, bug4081) end def test_prepend |