akr	2008-09-10 00:02:42 +0900 (Wed, 10 Sep 2008)

  New Revision: 19274

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

  Log:
    * include/ruby/io.h (rb_io_t): rename field: writeconv_stateless to
      writeconv_asciicompat.
    
    * io.c: follow the renaming.
    
    * gc.c: ditto.

  Modified files:
    trunk/ChangeLog
    trunk/gc.c
    trunk/include/ruby/io.h
    trunk/io.c

Index: include/ruby/io.h
===================================================================
--- include/ruby/io.h	(revision 19273)
+++ include/ruby/io.h	(revision 19274)
@@ -68,7 +68,7 @@
     int cbuf_capa;
 
     rb_econv_t *writeconv;
-    VALUE writeconv_stateless;
+    VALUE writeconv_asciicompat;
     int writeconv_pre_ecflags;
     VALUE writeconv_pre_ecopts;
     int writeconv_initialized;
@@ -124,7 +124,7 @@
     fp->cbuf_len = 0;\
     fp->cbuf_capa = 0;\
     fp->writeconv = NULL;\
-    fp->writeconv_stateless = Qnil;\
+    fp->writeconv_asciicompat = Qnil;\
     fp->writeconv_pre_ecflags = 0;\
     fp->writeconv_pre_ecopts = Qnil;\
     fp->writeconv_initialized = 0;\
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 19273)
+++ ChangeLog	(revision 19274)
@@ -1,3 +1,12 @@
+Wed Sep 10 00:01:36 2008  Tanaka Akira  <akr@f...>
+
+	* include/ruby/io.h (rb_io_t): rename field: writeconv_stateless to
+	  writeconv_asciicompat.
+
+	* io.c: follow the renaming.
+
+	* gc.c: ditto.
+
 Tue Sep  9 23:55:26 2008  Tanaka Akira  <akr@f...>
 
 	* io.c (io_fwrite): raise an error if ASCII incompatible string
Index: io.c
===================================================================
--- io.c	(revision 19273)
+++ io.c	(revision 19274)
@@ -709,7 +709,7 @@
             fptr->writeconv = rb_econv_open_opts("", "", ecflags, ecopts);
             if (!fptr->writeconv)
                 rb_exc_raise(rb_econv_open_exc("", "", ecflags));
-            fptr->writeconv_stateless = Qnil;
+            fptr->writeconv_asciicompat = Qnil;
         }
         else {
             enc = fptr->encs.enc2 ? fptr->encs.enc2 : fptr->encs.enc;
@@ -719,7 +719,7 @@
                 fptr->writeconv_pre_ecflags = ecflags;
                 fptr->writeconv_pre_ecopts = ecopts;
                 fptr->writeconv = NULL;
-                fptr->writeconv_stateless = Qnil;
+                fptr->writeconv_asciicompat = Qnil;
             }
             else {
                 /* double conversion */
@@ -727,11 +727,11 @@
                 fptr->writeconv_pre_ecopts = ecopts;
                 if (senc) {
                     denc = enc->name;
-                    fptr->writeconv_stateless = rb_str_new2(senc);
+                    fptr->writeconv_asciicompat = rb_str_new2(senc);
                 }
                 else {
                     senc = denc = "";
-                    fptr->writeconv_stateless = rb_str_new2(enc->name);
+                    fptr->writeconv_asciicompat = rb_str_new2(enc->name);
                 }
                 ecflags = fptr->encs.ecflags & (ECONV_ERROR_HANDLER_MASK|ECONV_STATEFUL_DECORATOR_MASK);
                 ecopts = fptr->encs.ecopts;
@@ -754,8 +754,8 @@
         make_writeconv(fptr);
 
         if (fptr->writeconv) {
-            if (!NIL_P(fptr->writeconv_stateless))
-                common_encoding = fptr->writeconv_stateless;
+            if (!NIL_P(fptr->writeconv_asciicompat))
+                common_encoding = fptr->writeconv_asciicompat;
             else if (!rb_enc_asciicompat(rb_enc_get(str))) {
                 rb_raise(rb_eArgError, "ASCII incompatible string written for text mode IO without encoding conversion: %s",
                          rb_enc_name(rb_enc_get(str)));
Index: gc.c
===================================================================
--- gc.c	(revision 19273)
+++ gc.c	(revision 19274)
@@ -1510,7 +1510,7 @@
         if (obj->as.file.fptr) {
             gc_mark(objspace, obj->as.file.fptr->pathv, lev);
             gc_mark(objspace, obj->as.file.fptr->tied_io_for_writing, lev);
-            gc_mark(objspace, obj->as.file.fptr->writeconv_stateless, lev);
+            gc_mark(objspace, obj->as.file.fptr->writeconv_asciicompat, lev);
             gc_mark(objspace, obj->as.file.fptr->writeconv_pre_ecopts, lev);
             gc_mark(objspace, obj->as.file.fptr->encs.ecopts, lev);
         }

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