kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* transcode.c (make_econv_exception): show U+XXXX form for undefined

Browse source 
conversion error from UTF-8.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@22039 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2009-02-04 13:01:12 +00:00
parent 5493666330
commit e193fa79d6
2 changed files with 21 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Wed Feb 4 21:59:31 2009 Tanaka Akira <akr@fsij.org>
* transcode.c (make_econv_exception): show U+XXXX form for undefined
conversion error from UTF-8.
Wed Feb 4 21:57:37 2009 Tanaka Akira <akr@fsij.org>
* string.c (rb_str_dump): use MBCLEN_CHARFOUND_P properly.

18
transcode.c
View file

@ -2009,9 +2009,23 @@ make_econv_exception(rb_econv_t *ec)
if (ec->last_error.result == econv_undefined_conversion) {
VALUE bytes = rb_str_new((const char *)ec->last_error.error_bytes_start,
ec->last_error.error_bytes_len);
VALUE dumped;
VALUE dumped = Qnil;
int idx;
dumped = rb_str_dump(bytes);
if (strcmp(ec->last_error.source_encoding, "UTF-8") == 0) {
rb_encoding *utf8 = rb_utf8_encoding();
const char *start, *end;
int n;
start = (const char *)ec->last_error.error_bytes_start;
end = start + ec->last_error.error_bytes_len;
n = rb_enc_precise_mbclen(start, end, utf8);
if (MBCLEN_CHARFOUND_P(n) &&
MBCLEN_CHARFOUND_LEN(n) == ec->last_error.error_bytes_len) {
unsigned int cc = rb_enc_codepoint(start, end, utf8);
dumped = rb_sprintf("U+%04X", cc);
}
}
if (dumped == Qnil)
dumped = rb_str_dump(bytes);
mesg = rb_sprintf("%s from %s to %s",
StringValueCStr(dumped),
ec->last_error.source_encoding,