matz	2008-01-18 10:30:41 +0900 (Fri, 18 Jan 2008)

  New Revision: 15103

  Modified files:
    trunk/ChangeLog
    trunk/encoding.c

  Log:
    * encoding.c (rb_enc_aliases_enc_i): exclude non alias names from
      Encoding.aliases.

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=15103&r2=15102&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/encoding.c?r1=15103&r2=15102&diff_format=u

Index: encoding.c
===================================================================
--- encoding.c	(revision 15102)
+++ encoding.c	(revision 15103)
@@ -498,8 +498,7 @@
 	}
 	else {
 	    i = load_encoding(name);
-	    enc = rb_enc_from_index(i);
-	    if (!enc->precise_mbc_enc_len) {
+	    if (enc_autoload_p(rb_enc_from_index(i))) {
 		rb_warn("failed to load encoding (%s); use ASCII-8BIT instead",
 			name);
 		return 0;
@@ -1149,11 +1148,16 @@
     VALUE str = rb_ary_entry(ary, idx);
 
     if (NIL_P(str)) {
-	str = rb_str_new2(rb_enc_name(rb_enc_from_index(idx)));
+	rb_encoding *enc = rb_enc_from_index(idx);
+
+	if (STRCASECMP((char*)name, rb_enc_name(enc)) == 0) {
+	    return ST_CONTINUE;
+	}
+	str = rb_str_new2(rb_enc_name(enc));
 	rb_ary_store(ary, idx, str);
     }
     rb_hash_aset(aliases, rb_str_new2((char *)name), str);
-    return 0;
+    return ST_CONTINUE;
 }
 
 /*
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 15102)
+++ ChangeLog	(revision 15103)
@@ -16,6 +16,9 @@
 
 	* parse.y (ripper_initialize): move parser->enc initialization.
 
+	* encoding.c (rb_enc_aliases_enc_i): exclude non alias names from
+	  Encoding.aliases.
+
 Fri Jan 18 07:06:25 2008  Yukihiro Matsumoto  <matz@r...>
 
 	* io.c (Init_IO): stdin/stdout may not be duplex.

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