From 622f19cdefb496b0e483edae7ab86b9ad5144a0d Mon Sep 17 00:00:00 2001 From: yugui Date: Sat, 13 Dec 2008 01:02:51 +0000 Subject: merges r20626 from trunk into ruby_1-9_1. * 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: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@20699 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- re.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 're.c') diff --git a/re.c b/re.c index a45ae47d9f..5ef1c7c49b 100644 --- a/re.c +++ b/re.c @@ -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))); } -- cgit v1.2.3