From 668bd7d992e3157e616ac7a0b0154d8accb17288 Mon Sep 17 00:00:00 2001 From: matz Date: Fri, 21 Dec 2007 05:03:14 +0000 Subject: * 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: svn+ssh://ci.ruby-lang.org/ruby/trunk@14402 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- re.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 're.c') diff --git a/re.c b/re.c index b6facf98ea..9306ae7bfd 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 && -- cgit v1.2.3