diff options
author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-12-24 09:38:20 +0000 |
---|---|---|
committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-12-24 09:38:20 +0000 |
commit | b910bb7761373464a884e9c21c2897247aeffa78 (patch) | |
tree | d1c5558dc128a8c8a2c58a8cfb6d46b075740f66 | |
parent | 96438d2bd8e209d176b42caecbc951766496a42d (diff) | |
download | ruby-b910bb7761373464a884e9c21c2897247aeffa78.tar.gz |
* re.c (rb_reg_prepare_re): show regexp encoding in the error message.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14597 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | re.c | 5 |
2 files changed, 8 insertions, 1 deletions
@@ -1,3 +1,7 @@ +Mon Dec 24 18:37:32 2007 Tanaka Akira <akr@fsij.org> + + * re.c (rb_reg_prepare_re): show regexp encoding in the error message. + Mon Dec 24 18:23:32 2007 Tanaka Akira <akr@fsij.org> * eval.c (rb_exc_raise): ANSI style. @@ -945,7 +945,10 @@ rb_reg_prepare_re(VALUE re, VALUE str) if (rb_reg_fixed_encoding_p(re)) { if (ENCODING_GET(re) != rb_enc_get_index(str) && rb_enc_str_coderange(str) != ENC_CODERANGE_7BIT) { - rb_raise(rb_eArgError, "fixed character encoding regexp with incompatible string (encoding: %s)", rb_enc_name(rb_enc_get(str))); + rb_raise(rb_eArgError, + "incompatible encoding regexp match (%s regexp with %s string)", + rb_enc_name(rb_enc_from_index(ENCODING_GET(re))), + rb_enc_name(rb_enc_get(str))); } } else { |