nobu	2008-12-11 11:51:46 +0900 (Thu, 11 Dec 2008)

  New Revision: 20623

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

  Log:
    * encoding.c (rb_locale_encoding): removed Encoding::LOCALE.
    * encoding.c (rb_enc_set_default_external): ditto.
    
    * encoding.c (rb_enc_set_default_internal): ditto.

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/encoding.c
    trunk/ChangeLog
    trunk/encoding.c

Index: encoding.c
===================================================================
--- encoding.c	(revision 20622)
+++ encoding.c	(revision 20623)
@@ -349,11 +349,18 @@
     return ENC_DUMMY_P(enc_table.list[must_encoding(enc)].enc) ? Qtrue : Qfalse;
 }
 
+static const char *
+enc_alias_internal(const char *alias, int idx)
+{
+    alias = strdup(alias);
+    st_insert(enc_table.names, (st_data_t)alias, (st_data_t)idx);
+    return alias;
+}
+
 static int
 enc_alias(const char *alias, int idx)
 {
-    alias = strdup(alias);
-    st_insert(enc_table.names, (st_data_t)alias, (st_data_t)idx);
+    alias = enc_alias_internal(alias, idx);
     set_encoding_const(alias, rb_enc_from_index(idx));
     return idx;
 }
@@ -1000,7 +1007,7 @@
     else if ((idx = rb_enc_find_index(StringValueCStr(charmap))) < 0)
         idx = rb_ascii8bit_encindex();
 
-    if (rb_enc_registered("locale") < 0) enc_alias("locale", idx);
+    if (rb_enc_registered("locale") < 0) enc_alias_internal("locale", idx);
 
     return rb_enc_from_index(idx);
 }
@@ -1057,7 +1064,7 @@
 {
     default_external_index = rb_enc_to_index(rb_to_encoding(encoding));
     default_external = 0;
-    enc_alias("external", default_external_index);
+    enc_alias_internal("external", default_external_index);
 }
 
 /* -2 => not yet set, -1 => nil */
@@ -1112,7 +1119,7 @@
     if (default_internal_index == rb_usascii_encindex())
 	default_internal_index = rb_utf8_encindex();
     default_internal = 0;
-    enc_alias("internal", default_internal_index);
+    enc_alias_internal("internal", default_internal_index);
 }
 
 /*
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 20622)
+++ ChangeLog	(revision 20623)
@@ -1,3 +1,11 @@
+Thu Dec 11 11:51:36 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* encoding.c (rb_locale_encoding): removed Encoding::LOCALE.
+
+	* encoding.c (rb_enc_set_default_external): ditto.
+
+	* encoding.c (rb_enc_set_default_internal): ditto.
+
 Thu Dec 11 11:11:03 2008  Nobuyoshi Nakada  <nobu@r...>
 
 	* include/ruby/st.h (size_t): needs stddef.h or stdlib.h.
Index: ruby_1_9_1/encoding.c
===================================================================
--- ruby_1_9_1/encoding.c	(revision 20622)
+++ ruby_1_9_1/encoding.c	(revision 20623)
@@ -349,11 +349,18 @@
     return ENC_DUMMY_P(enc_table.list[must_encoding(enc)].enc) ? Qtrue : Qfalse;
 }
 
+static const char *
+enc_alias_internal(const char *alias, int idx)
+{
+    alias = strdup(alias);
+    st_insert(enc_table.names, (st_data_t)alias, (st_data_t)idx);
+    return alias;
+}
+
 static int
 enc_alias(const char *alias, int idx)
 {
-    alias = strdup(alias);
-    st_insert(enc_table.names, (st_data_t)alias, (st_data_t)idx);
+    alias = enc_alias_internal(alias, idx);
     set_encoding_const(alias, rb_enc_from_index(idx));
     return idx;
 }
@@ -1000,7 +1007,7 @@
     else if ((idx = rb_enc_find_index(StringValueCStr(charmap))) < 0)
         idx = rb_ascii8bit_encindex();
 
-    if (rb_enc_registered("locale") < 0) enc_alias("locale", idx);
+    if (rb_enc_registered("locale") < 0) enc_alias_internal("locale", idx);
 
     return rb_enc_from_index(idx);
 }
@@ -1057,7 +1064,7 @@
 {
     default_external_index = rb_enc_to_index(rb_to_encoding(encoding));
     default_external = 0;
-    enc_alias("external", default_external_index);
+    enc_alias_internal("external", default_external_index);
 }
 
 /* -2 => not yet set, -1 => nil */
@@ -1112,7 +1119,7 @@
     if (default_internal_index == rb_usascii_encindex())
 	default_internal_index = rb_utf8_encindex();
     default_internal = 0;
-    enc_alias("internal", default_internal_index);
+    enc_alias_internal("internal", default_internal_index);
 }
 
 /*
Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 20622)
+++ ruby_1_9_1/ChangeLog	(revision 20623)
@@ -1,3 +1,11 @@
+Thu Dec 11 11:51:36 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* encoding.c (rb_locale_encoding): removed Encoding::LOCALE.
+
+	* encoding.c (rb_enc_set_default_external): ditto.
+
+	* encoding.c (rb_enc_set_default_internal): ditto.
+
 Thu Dec 11 11:11:03 2008  Nobuyoshi Nakada  <nobu@r...>
 
 	* include/ruby/st.h (size_t): needs stddef.h or stdlib.h.

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