1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* string.c (String#dump): Change escaping of non-ASCII characters in

Browse Source 
UTF-8 to use upper-case four-digit hexadecimal escapes without braces
  where possible [Feature #12419].
* test/ruby/test_string.rb (test_dump): Add tests for above.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55728 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
duerst 2016-07-22 08:13:38 +00:00
parent 21269d37a1
commit c6692d9410
3 changed files with 31 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
Fri Jul 22 17:13:37 2016 Martin Duerst <duerst@it.aoyama.ac.jp>
* string.c (String#dump): Change escaping of non-ASCII characters in
UTF-8 to use upper-case four-digit hexadecimal escapes without braces
where possible [Feature #12419].
* test/ruby/test_string.rb (test_dump): Add tests for above.
Fri Jul 22 10:35:35 2016 Kouhei Sutou <kou@cozmixng.org> Fri Jul 22 10:35:35 2016 Kouhei Sutou <kou@cozmixng.org>
* lib/rexml/attribute.rb (REXML::Attribute#to_string): Fix wrong * lib/rexml/attribute.rb (REXML::Attribute#to_string): Fix wrong

15
string.c
View File

@ -5656,12 +5656,16 @@ rb_str_dump(VALUE str)
len++; len++;
} }
else { else {
if (u8 && c > 0x7F) { /* \u{NN} */ if (u8 && c > 0x7F) { /* \u notation */
int n = rb_enc_precise_mbclen(p-1, pend, enc); int n = rb_enc_precise_mbclen(p-1, pend, enc);
if (MBCLEN_CHARFOUND_P(n)) { if (MBCLEN_CHARFOUND_P(n)) {
unsigned int cc = rb_enc_mbc_to_codepoint(p-1, pend, enc); unsigned int cc = rb_enc_mbc_to_codepoint(p-1, pend, enc);
while (cc >>= 4) len++; if (cc <= 0xFFFF)
len += 5; len += 6; /* \uXXXX */
else if (cc <= 0xFFFFF)
len += 9; /* \u{XXXXX} */
else
len += 10; /* \u{XXXXXX} */
p += MBCLEN_CHARFOUND_LEN(n)-1; p += MBCLEN_CHARFOUND_LEN(n)-1;
break; break;
} }
@ -5734,7 +5738,10 @@ rb_str_dump(VALUE str)
if (MBCLEN_CHARFOUND_P(n)) { if (MBCLEN_CHARFOUND_P(n)) {
int cc = rb_enc_mbc_to_codepoint(p-1, pend, enc); int cc = rb_enc_mbc_to_codepoint(p-1, pend, enc);
p += n; p += n;
snprintf(q, qend-q, "u{%x}", cc); if (cc <= 0xFFFF)
snprintf(q, qend-q, "u%04X", cc); /* \uXXXX */
else
snprintf(q, qend-q, "u{%X}", cc); /* \u{XXXXX} or \u{XXXXXX} */
q += strlen(q); q += strlen(q);
continue; continue;
} }

12
test/ruby/test_string.rb
View File

@ -614,6 +614,18 @@ CODE
def test_dump def test_dump
a= S("Test") << 1 << 2 << 3 << 9 << 13 << 10 a= S("Test") << 1 << 2 << 3 << 9 << 13 << 10
assert_equal(S('"Test\\x01\\x02\\x03\\t\\r\\n"'), a.dump) assert_equal(S('"Test\\x01\\x02\\x03\\t\\r\\n"'), a.dump)
b= S("\u{7F}")
assert_equal(S('"\\x7F"'), b.dump)
b= S("\u{AB}")
assert_equal(S('"\\u00AB"'), b.dump)
b= S("\u{ABC}")
assert_equal(S('"\\u0ABC"'), b.dump)
b= S("\uABCD")
assert_equal(S('"\\uABCD"'), b.dump)
b= S("\u{ABCDE}")
assert_equal(S('"\\u{ABCDE}"'), b.dump)
b= S("\u{10ABCD}")
assert_equal(S('"\\u{10ABCD}"'), b.dump)
end end
def test_dup def test_dup