[前][次][番号順一覧][スレッド一覧]

ruby-changes:12496

From: naruse <ko1@a...>
Date: Sun, 19 Jul 2009 00:02:28 +0900 (JST)
Subject: [ruby-changes:12496] Ruby:r24197 (trunk): use rb_enc_get to get the encoding of a Regexp object.

naruse	2009-07-19 00:00:50 +0900 (Sun, 19 Jul 2009)

  New Revision: 24197

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=24197

  Log:
    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]

  Modified files:
    trunk/ChangeLog
    trunk/re.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 24196)
+++ ChangeLog	(revision 24197)
@@ -1,3 +1,10 @@
+Sat Jul 18 23:44:59 2009  NARUSE, Yui  <naruse@r...>
+
+	* 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  <nobu@r...>
 
 	* string.c (rb_str_hash_cmp): got rid of overflow.
Index: re.c
===================================================================
--- re.c	(revision 24196)
+++ re.c	(revision 24197)
@@ -1181,7 +1181,7 @@
 {
     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)));
 }
 

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]