1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@22017 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2009-02-03 14:37:09 +00:00
parent bca5029d8b
commit 813dad7afd
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
Tue Feb 3 23:37:08 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ruby.c (load_file_internal): resets EOF flag after parse.
Tue Feb 3 23:13:34 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> Tue Feb 3 23:13:34 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* vm.c (vm_backtrace): always returns non-nil array if lev is * vm.c (vm_backtrace): always returns non-nil array if lev is

4
ruby.c
View File

@ -1581,7 +1581,6 @@ load_file_internal(VALUE arg)
rb_io_ungetbyte(f, c); rb_io_ungetbyte(f, c);
} }
require_libraries(opt); /* Why here? unnatural */ require_libraries(opt); /* Why here? unnatural */
rb_io_ungetbyte(f, Qnil);
} }
if (opt->src.enc.index >= 0) { if (opt->src.enc.index >= 0) {
enc = rb_enc_from_index(opt->src.enc.index); enc = rb_enc_from_index(opt->src.enc.index);
@ -1601,6 +1600,9 @@ load_file_internal(VALUE arg)
else if (f != rb_stdin) { else if (f != rb_stdin) {
rb_io_close(f); rb_io_close(f);
} }
else {
rb_io_ungetbyte(f, Qnil);
}
return (VALUE)tree; return (VALUE)tree;
} }