diff options
| author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-11 04:40:08 +0000 |
|---|---|---|
| committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-11 04:40:08 +0000 |
| commit | f7f42c30200e5635358c3bfbcfba19f746beeba1 (patch) | |
| tree | 09627ed2623dca924b71ef750a95a2d5858af83e /re.c | |
| parent | be666886691d40307a0247af0fb9c0d5cbd53f1c (diff) | |
| download | ruby-f7f42c30200e5635358c3bfbcfba19f746beeba1.tar.gz ruby-f7f42c30200e5635358c3bfbcfba19f746beeba1.tar.xz ruby-f7f42c30200e5635358c3bfbcfba19f746beeba1.zip | |
* re.c (reg_enc_error): raise EncodingCompatibilityError for
encoding incompatibility. [ruby-core:18600]
* re.c (rb_reg_prepare_enc): more consistent error message.
[ruby-core:18611]
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@20626 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 're.c')
| -rw-r--r-- | re.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1168,7 +1168,7 @@ rb_reg_preprocess(const char *p, const char *end, rb_encoding *enc, static void reg_enc_error(VALUE re, VALUE str) { - rb_raise(rb_eArgError, + rb_raise(rb_eEncCompatError, "incompatible encoding regexp match (%s regexp with %s string)", rb_enc_name(RREGEXP(re)->ptr->enc), rb_enc_name(rb_enc_get(str))); @@ -1181,7 +1181,7 @@ rb_reg_prepare_enc(VALUE re, VALUE str, int warn) if (rb_enc_str_coderange(str) == ENC_CODERANGE_BROKEN) { rb_raise(rb_eArgError, - "broken %s string", + "invalid byte sequence in %s", rb_enc_name(rb_enc_get(str))); } |