From 07601c1c9b43acc3dfbd08d9fb4e249c960ab494 Mon Sep 17 00:00:00 2001 From: naruse Date: Sat, 18 Jul 2009 15:00:50 +0000 Subject: 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/trunk@24197 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 7 +++++++ re.c | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index aab459609..d12f5e36b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Sat Jul 18 23:44:59 2009 NARUSE, Yui + + * 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] + Sat Jul 18 17:43:12 2009 Nobuyoshi Nakada * string.c (rb_str_hash_cmp): got rid of overflow. diff --git a/re.c b/re.c index 447728da0..7ccb46cc0 100644 --- a/re.c +++ b/re.c @@ -1181,7 +1181,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