naruse	2008-01-28 18:03:09 +0900 (Mon, 28 Jan 2008)

  New Revision: 15292

  Modified files:
    trunk/ChangeLog
    trunk/parse.y
    trunk/re.c
    trunk/string.c

  Log:
    * string.c, parse.y, re.c: use rb_ascii8bit_encoding.

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/string.c?r1=15292&r2=15291&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/parse.y?r1=15292&r2=15291&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=15292&r2=15291&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/re.c?r1=15292&r2=15291&diff_format=u

Index: re.c
===================================================================
--- re.c	(revision 15291)
+++ re.c	(revision 15292)
@@ -2466,7 +2466,7 @@
 	if (argc == 3 && !NIL_P(argv[2])) {
 	    char *kcode = StringValuePtr(argv[2]);
 	    if (kcode[0] == 'n' || kcode[1] == 'N') {
-		enc = rb_enc_from_index(0);
+		enc = rb_ascii8bit_encoding();
 		flags |= ARG_ENCODING_FIXED;
 	    }
 	    else {
@@ -2514,7 +2514,7 @@
     }
     if (ascii_only && rb_enc_get_index(str) != 0) {
         str = rb_str_new3(str);
-        rb_enc_associate(str, rb_enc_from_index(0));
+        rb_enc_associate(str, rb_ascii8bit_encoding());
     }
     return str;
 
@@ -2746,7 +2746,7 @@
             result_enc = has_ascii_compat_fixed;
         }
         else {
-            result_enc = rb_enc_from_index(0);
+            result_enc = rb_ascii8bit_encoding();
         }
 
         rb_enc_associate(source, result_enc);
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 15291)
+++ ChangeLog	(revision 15292)
@@ -1,3 +1,7 @@
+Mon Jan 28 11:17:28 2008  NARUSE, Yui  <naruse@r...>
+
+	* string.c, parse.y, re.c: use rb_ascii8bit_encoding.
+
 Mon Jan 28 17:54:15 2008  NARUSE, Yui  <naruse@r...>
 
 	* enc/utf_7.h: add dummy encoding UTF-7 and its alias CP65000.
Index: string.c
===================================================================
--- string.c	(revision 15291)
+++ string.c	(revision 15292)
@@ -3477,7 +3477,7 @@
     *q++ = '"';
     if (!rb_enc_asciicompat(enc0)) {
 	sprintf(q, ".force_encoding(\"%s\")", enc0->name);
-	enc0 = rb_enc_from_index(0);
+	enc0 = rb_ascii8bit_encoding();
     }
 
     OBJ_INFECT(result, str);
Index: parse.y
===================================================================
--- parse.y	(revision 15291)
+++ parse.y	(revision 15292)
@@ -271,7 +271,7 @@
 #define STR_NEW0() rb_enc_str_new(0,0,rb_usascii_encoding())
 #define STR_NEW2(p) rb_enc_str_new((p),strlen(p),parser->enc)
 #define STR_NEW3(p,n,e,func) parser_str_new((p),(n),(e),(func),parser->enc)
-#define STR_ENC(m) ((m)?parser->enc:rb_enc_from_index(0))
+#define STR_ENC(m) ((m)?parser->enc:rb_ascii8bit_encoding())
 #define ENC_SINGLE(cr) ((cr)==ENC_CODERANGE_7BIT)
 #define TOK_INTERN(mb) rb_intern3(tok(), toklen(), STR_ENC(mb))
 
@@ -8842,7 +8842,7 @@
 int
 rb_symname_p(const char *name)
 {
-    return rb_enc_symname_p(name, rb_enc_from_index(0));
+    return rb_enc_symname_p(name, rb_ascii8bit_encoding());
 }
 
 int
@@ -8953,7 +8953,7 @@
       case '$':
 	id |= ID_GLOBAL;
 	if ((mb = is_special_global_name(++m, e, enc)) != 0) {
-	    if (!--mb) enc = rb_enc_from_index(0);
+	    if (!--mb) enc = rb_ascii8bit_encoding();
 	    goto new_id;
 	}
 	break;
@@ -9039,7 +9039,7 @@
 ID
 rb_intern2(const char *name, long len)
 {
-    return rb_intern3(name, len, rb_enc_from_index(0));
+    return rb_intern3(name, len, rb_ascii8bit_encoding());
 }
 
 #undef rb_intern

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