[前][次][番号順一覧][スレッド一覧]

ruby-changes:10467

From: nobu <ko1@a...>
Date: Tue, 3 Feb 2009 23:37:20 +0900 (JST)
Subject: [ruby-changes:10467] Ruby:r22017 (trunk): * ruby.c (load_file_internal): resets EOF flag after parse.

nobu	2009-02-03 23:37:09 +0900 (Tue, 03 Feb 2009)

  New Revision: 22017

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

  Log:
    * ruby.c (load_file_internal): resets EOF flag after parse.

  Modified files:
    trunk/ChangeLog
    trunk/ruby.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 22016)
+++ ChangeLog	(revision 22017)
@@ -1,3 +1,7 @@
+Tue Feb  3 23:37:08 2009  Nobuyoshi Nakada  <nobu@r...>
+
+	* ruby.c (load_file_internal): resets EOF flag after parse.
+
 Tue Feb  3 23:13:34 2009  Nobuyoshi Nakada  <nobu@r...>
 
 	* vm.c (vm_backtrace): always returns non-nil array if lev is
Index: ruby.c
===================================================================
--- ruby.c	(revision 22016)
+++ ruby.c	(revision 22017)
@@ -1581,7 +1581,6 @@
 	    rb_io_ungetbyte(f, c);
 	}
 	require_libraries(opt);	/* Why here? unnatural */
-	rb_io_ungetbyte(f, Qnil);
     }
     if (opt->src.enc.index >= 0) {
 	enc = rb_enc_from_index(opt->src.enc.index);
@@ -1601,6 +1600,9 @@
     else if (f != rb_stdin) {
 	rb_io_close(f);
     }
+    else {
+	rb_io_ungetbyte(f, Qnil);
+    }
     return (VALUE)tree;
 }
 

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

[前][次][番号順一覧][スレッド一覧]