From 12265cfd3dcf0e188d7d2d332641cc5e4288f92b Mon Sep 17 00:00:00 2001 From: yugui Date: Sun, 26 Jul 2009 15:32:11 +0000 Subject: merges r24197 from trunk into ruby_1_9_1. -- use rb_enc_get to get the encoding of a Regexp object. * re.c (reg_enc_error): use rb_enc_get to get the encoding of a Regexp object. REGEXP(re)->ptr->enc is the encoding of the regexp engin for patterns and target strings. [ruby-core:23208] git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@24289 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 699e90ab4..f1fa5a435 100644 --- a/re.c +++ b/re.c @@ -1171,7 +1171,7 @@ reg_enc_error(VALUE re, VALUE str) { 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(re)), rb_enc_name(rb_enc_get(str))); } -- cgit