summaryrefslogtreecommitdiffstats
path: root/re.c
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-12-21 05:03:14 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-12-21 05:03:14 +0000
commite43c19a8259b51e38e13da2fb2eb388a2c7b9efb (patch)
tree88293a3d29c63d2aa271109cfb667f10346e03e9 /re.c
parentb898be9748ff7b9a40ac6de0d8081d6cafd9c5d1 (diff)
downloadruby-e43c19a8259b51e38e13da2fb2eb388a2c7b9efb.tar.gz
ruby-e43c19a8259b51e38e13da2fb2eb388a2c7b9efb.tar.xz
ruby-e43c19a8259b51e38e13da2fb2eb388a2c7b9efb.zip
* test/ruby/test_system.rb (TestSystem::valid_syntax): apply
ASCII-8BIT encoding explicitly. * re.c (rb_reg_prepare_re): add encoding name in the message. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@14402 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 're.c')
-rw-r--r--re.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/re.c b/re.c
index b6facf98e..9306ae7bf 100644
--- a/re.c
+++ b/re.c
@@ -943,7 +943,7 @@ 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");
+ rb_raise(rb_eArgError, "fixed character encoding regexp with incompatible string (encoding: %s)", rb_enc_name(rb_enc_get(str)));
}
}
else if ((enc = rb_enc_get(str)) != 0 &&