nobu	2007-10-17 11:30:57 +0900 (Wed, 17 Oct 2007)

  New Revision: 13732

  Modified files:
    trunk/ChangeLog
    trunk/encoding.c
    trunk/re.c

  Log:
    * encoding.c (rb_enc_from_encoding, rb_enc_register): associate index
      to self.
    
    * encoding.c (enc_capable): Encoding objects are encoding capable.
    
    * re.c (rb_reg_s_union): check if encoding matching by exact encoding
      objects.


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=13732&r2=13731
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/re.c?r1=13732&r2=13731
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/encoding.c?r1=13732&r2=13731

Index: encoding.c
===================================================================
--- encoding.c	(revision 13731)
+++ encoding.c	(revision 13732)
@@ -45,9 +45,14 @@
 }
 
 VALUE
-rb_enc_from_encoding(rb_encoding *enc)
+rb_enc_from_encoding(rb_encoding *encoding)
 {
-    return enc_initialized_p(enc) ? ENC_FROM_ENCODING(enc) : enc_new(enc);
+    VALUE enc;
+    if (enc_initialized_p(encoding))
+	return ENC_FROM_ENCODING(encoding);
+    enc = enc_new(encoding);
+    rb_enc_associate(enc, encoding);
+    return enc;
 }
 
 static rb_encoding *
@@ -136,7 +141,8 @@
     encoding = ent->enc;
     encoding->name = name;
     if (rb_cEncoding) {
-	enc_new(encoding);
+	VALUE enc = enc_new(encoding);
+	rb_enc_associate_index(enc, newsize);
     }
     else {
 	encoding->auxiliary_data = ENC_UNINITIALIZED;
@@ -229,6 +235,8 @@
       case T_REGEXP:
       case T_FILE:
 	return Qtrue;
+      case T_DATA:
+	if (RDATA(obj)->dmark == enc_mark) return Qtrue;
       default:
 	return Qfalse;
     }
Index: re.c
===================================================================
--- re.c	(revision 13731)
+++ re.c	(revision 13732)
@@ -1783,7 +1783,7 @@
     else {
 	int i;
 	VALUE source = rb_str_buf_new(0);
-	VALUE tmp = rb_ary_entry(args0, 0);
+	VALUE enc0 = rb_obj_encoding(rb_ary_entry(args0, 0));
 
 	for (i = 0; i < argc; i++) {
 	    volatile VALUE v;
@@ -1792,12 +1792,12 @@
 		rb_str_buf_cat2(source, "|");
 	    v = rb_check_regexp_type(e);
 	    if (!NIL_P(v)) {
-		rb_enc_check(tmp, v);
+		rb_enc_check(enc0, v);
 		v = rb_reg_to_s(v);
 	    }
 	    else {
-		rb_enc_check(tmp, e);
 		v = rb_reg_s_quote(Qnil, e);
+		rb_enc_check(enc0, rb_obj_encoding(v));
 	    }
 	    rb_str_append(source, v);
 	}
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 13731)
+++ ChangeLog	(revision 13732)
@@ -1,3 +1,13 @@
+Wed Oct 17 11:30:55 2007  Nobuyoshi Nakada  <nobu@r...>
+
+	* encoding.c (rb_enc_from_encoding, rb_enc_register): associate index
+	  to self.
+
+	* encoding.c (enc_capable): Encoding objects are encoding capable.
+
+	* re.c (rb_reg_s_union): check if encoding matching by exact encoding
+	  objects.
+
 Wed Oct 17 06:18:06 2007  Nobuyoshi Nakada  <nobu@r...>
 
 	* encoding.c (rb_enc_alias, rb_enc_find_index): changed

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