nobu	2010-11-28 14:56:39 +0900 (Sun, 28 Nov 2010)

  New Revision: 29960

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

  Log:
    * io.c (struct argf): make lineno long, and reorder members.

  Modified files:
    trunk/ChangeLog
    trunk/io.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 29959)
+++ ChangeLog	(revision 29960)
@@ -1,3 +1,7 @@
+Sun Nov 28 14:56:32 2010  Nobuyoshi Nakada  <nobu@r...>
+
+	* io.c (struct argf): make lineno long, and reorder members.
+
 Sun Nov 28 14:55:42 2010  Nobuyoshi Nakada  <nobu@r...>
 
 	* thread_win32.c (gvl_release, gvl_init): suppress warnings.
Index: io.c
===================================================================
--- io.c	(revision 29959)
+++ io.c	(revision 29960)
@@ -145,13 +145,12 @@
 
 struct argf {
     VALUE filename, current_file;
-    int last_lineno;		/* $. */
-    int lineno;
-    int init_p, next_p;
+    long last_lineno;		/* $. */
+    long lineno;
     VALUE argv;
     char *inplace;
-    int binmode;
     struct rb_io_enc_t encs;
+    char init_p, next_p, binmode;
 };
 
 static int max_file_descriptor = NOFILE;
@@ -6945,7 +6944,7 @@
 argf_getline(int argc, VALUE *argv, VALUE argf)
 {
     VALUE line;
-    int lineno = ARGF.lineno;
+    long lineno = ARGF.lineno;
 
   retry:
     if (!next_argv()) return Qnil;
@@ -7176,7 +7175,7 @@
 static VALUE
 argf_readlines(int argc, VALUE *argv, VALUE argf)
 {
-    int lineno = ARGF.lineno;
+    long lineno = ARGF.lineno;
     VALUE lines, ary;
 
     ary = rb_ary_new();

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