diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-08-12 18:17:05 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-08-12 18:17:05 +0000 |
| commit | 85c41f4fbcd58d3515a02d639f6e18b658c09034 (patch) | |
| tree | 9ab1afc6eee0eadb38e68a4dd6c47c109fb2d1ad /encoding.c | |
| parent | fc6484cbf445bfaeb1b68fb48ee5dc72731ac564 (diff) | |
* error.c (rb_eEncCompatError): add Exception.
* include/ruby/ruby.h: ditto.
* encoding.c (rb_enc_check): use rb_eEncCompatError.
* string.c (rb_enc_cr_str_buf_cat): ditto.
* string.c (rb_str_sub_bang): ditto.
* string.c (rb_str_hex): ditto.
* string.c (rb_str_oct): ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18546 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'encoding.c')
| -rw-r--r-- | encoding.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/encoding.c b/encoding.c index a6d0fcd3d7..d1cf17510d 100644 --- a/encoding.c +++ b/encoding.c @@ -600,7 +600,7 @@ rb_enc_check(VALUE str1, VALUE str2) { rb_encoding *enc = rb_enc_compatible(str1, str2); if (!enc) - rb_raise(rb_eArgError, "character encodings differ: %s and %s", + rb_raise(rb_eEncCompatError, "incompatible character encodings: %s and %s", rb_enc_name(rb_enc_get(str1)), rb_enc_name(rb_enc_get(str2))); return enc; @@ -743,7 +743,7 @@ rb_enc_codepoint(const char *p, const char *e, rb_encoding *enc) if (MBCLEN_CHARFOUND_P(r)) return rb_enc_mbc_to_codepoint(p, e, enc); else - rb_raise(rb_eArgError, "invalid mbstring sequence"); + rb_raise(rb_eArgError, "invalid byte sequence in %s", rb_enc_name(enc)); } int @@ -751,7 +751,7 @@ rb_enc_codelen(int c, rb_encoding *enc) { int n = ONIGENC_CODE_TO_MBCLEN(enc,c); if (n == 0) { - rb_raise(rb_eArgError, "invalid codepoint 0x%x", c); + rb_raise(rb_eArgError, "invalid codepoint 0x%x in %s", c, rb_enc_name(enc)); } return n; } |