matz	2007-12-22 03:55:30 +0900 (Sat, 22 Dec 2007)

  New Revision: 14443

  Modified files:
    trunk/ChangeLog
    trunk/encoding.c
    trunk/include/ruby/encoding.h
    trunk/io.c
    trunk/numeric.c
    trunk/re.c
    trunk/ruby.c
    trunk/transcode.c

  Log:
    * encoding.c (rb_ascii_encoding): renamed from previous
      rb_default_encoding().

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/numeric.c?r1=14443&r2=14442
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ruby.c?r1=14443&r2=14442
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=14443&r2=14442
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/transcode.c?r1=14443&r2=14442
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/io.c?r1=14443&r2=14442
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/include/ruby/encoding.h?r1=14443&r2=14442
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/re.c?r1=14443&r2=14442
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/encoding.c?r1=14443&r2=14442

Index: encoding.c
===================================================================
--- encoding.c	(revision 14442)
+++ encoding.c	(revision 14443)
@@ -236,7 +236,7 @@
     enc_check_duplication(name);
     if (index < ENCODING_INLINE_MAX) index = ENCODING_INLINE_MAX;
     if (enc_table_expand(index + 1) < 0) return -1;
-    encoding = rb_default_encoding();
+    encoding = rb_ascii_encoding();
     enc_register_at(index, name, encoding);
     enc = set_based_encoding(index, encoding);
     FL_SET(enc, ENC_DUMMY);
@@ -742,7 +742,7 @@
 }
 
 rb_encoding *
-rb_default_encoding(void)
+rb_ascii_encoding(void)
 {
     if (!enc_table) {
 	rb_enc_init();
Index: include/ruby/encoding.h
===================================================================
--- include/ruby/encoding.h	(revision 14442)
+++ include/ruby/encoding.h	(revision 14443)
@@ -115,7 +115,7 @@
 int rb_enc_str_asciionly_p(VALUE);
 #define rb_enc_str_asciicompat_p(str) rb_enc_asciicompat(rb_enc_get(str))
 VALUE rb_enc_from_encoding(rb_encoding *enc);
-rb_encoding *rb_default_encoding(void);
+rb_encoding *rb_ascii_encoding(void);
 rb_encoding *rb_utf8_encoding(void);
 rb_encoding *rb_default_external_encoding(void);
 VALUE rb_enc_default_external(void);
Index: re.c
===================================================================
--- re.c	(revision 14442)
+++ re.c	(revision 14443)
@@ -954,7 +954,7 @@
             need_recompile = 1;
         }
         if ((RBASIC(re)->flags & REG_ENCODING_NONE) &&
-	    enc != rb_default_encoding() &&
+	    enc != rb_ascii_encoding() &&
             rb_enc_str_coderange(str) != ENC_CODERANGE_7BIT) {
             rb_warn("none encoding regexp with non ASCII string (string encoding: %s)",
                     rb_enc_name(enc));
@@ -1964,7 +1964,7 @@
     struct RRegexp *re = RREGEXP(obj);
     VALUE unescaped;
     rb_encoding *fixed_enc = 0;
-    rb_encoding *d_enc = rb_default_encoding();
+    rb_encoding *a_enc = rb_ascii_encoding();
 
     if (!OBJ_TAINTED(obj) && rb_safe_level() >= 4)
 	rb_raise(rb_eSecurityError, "Insecure: can't modify regexp");
@@ -1982,17 +1982,17 @@
 
     if (fixed_enc) {
 	if ((fixed_enc != enc && (options & ARG_ENCODING_FIXED)) ||
-            (fixed_enc != d_enc && (options & ARG_ENCODING_NONE))) {
+            (fixed_enc != a_enc && (options & ARG_ENCODING_NONE))) {
 	    strcpy(err, "incompatible character encoding");
 	    return -1;
 	}
-        if (fixed_enc != d_enc) {
+        if (fixed_enc != a_enc) {
 	    options |= ARG_ENCODING_FIXED;
 	    enc = fixed_enc;
 	}
     }
     else if (!(options & ARG_ENCODING_FIXED)) {
-        enc = d_enc;
+        enc = a_enc;
     }
 
     rb_enc_associate((VALUE)re, enc);
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 14442)
+++ ChangeLog	(revision 14443)
@@ -1,3 +1,8 @@
+Sat Dec 22 03:54:18 2007  Yukihiro Matsumoto  <matz@r...>
+
+	* encoding.c (rb_ascii_encoding): renamed from previous
+	  rb_default_encoding().
+
 Sat Dec 22 02:49:02 2007  Yukihiro Matsumoto  <matz@r...>
 
 	* parse.y (command): block from cmd_brace_block was ignored.
Index: io.c
===================================================================
--- io.c	(revision 14442)
+++ io.c	(revision 14443)
@@ -2862,7 +2862,7 @@
 
 #endif
     fptr->mode |= FMODE_BINMODE;
-    fptr->enc = rb_default_encoding();
+    fptr->enc = rb_ascii_encoding();
     return io;
 }
 
Index: numeric.c
===================================================================
--- numeric.c	(revision 14442)
+++ numeric.c	(revision 14443)
@@ -1860,7 +1860,7 @@
 	break;
     }
     enc = rb_to_encoding(argv[0]);
-    if (!enc) enc = rb_default_encoding();
+    if (!enc) enc = rb_ascii_encoding();
     if (i < 0 || (n = rb_enc_codelen(i, enc)) <= 0) goto out_of_range;
     str = rb_enc_str_new(0, n, enc);
     rb_enc_mbcput(i, RSTRING_PTR(str), enc);
Index: ruby.c
===================================================================
--- ruby.c	(revision 14442)
+++ ruby.c	(revision 14443)
@@ -144,12 +144,12 @@
     int idx;
 
     if (codeset == Qnil)
-        return rb_default_encoding();
+        return rb_ascii_encoding();
 
     name = StringValueCStr(codeset);
     idx = rb_enc_find_index(name);
     if (idx < 0)
-        return rb_default_encoding();
+        return rb_ascii_encoding();
     return rb_enc_from_index(idx);
 }
 
Index: transcode.c
===================================================================
--- transcode.c	(revision 14442)
+++ transcode.c	(revision 14443)
@@ -345,7 +345,7 @@
     }
     /* set encoding */
     if (!to_enc) {
-	to_encidx = rb_enc_replicate(to_e, rb_default_encoding());
+	to_encidx = rb_enc_replicate(to_e, rb_ascii_encoding());
     }
     *self = dest;
 

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