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 | 64ecf13131f3f7b45f9bd4b5b86888a4ef84343d (patch) | |
| tree | d1c5558dc128a8c8a2c58a8cfb6d46b075740f66 /re.c | |
| parent | 383f19050dfcf214fc6ac902e0c46477b9ee2dea (diff) | |
| download | ruby-64ecf13131f3f7b45f9bd4b5b86888a4ef84343d.tar.gz ruby-64ecf13131f3f7b45f9bd4b5b86888a4ef84343d.tar.xz ruby-64ecf13131f3f7b45f9bd4b5b86888a4ef84343d.zip | |
* re.c (rb_reg_prepare_re): show regexp encoding in the error message.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@14597 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 're.c')
| -rw-r--r-- | re.c | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -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 { |