diff options
| author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2003-02-21 09:33:05 +0000 |
|---|---|---|
| committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2003-02-21 09:33:05 +0000 |
| commit | 32f5e4ecdbfe08dc4549e5fa371a98bca104b46c (patch) | |
| tree | e3e48cb5f264d59bcf5edd41e91fd5de49ef6d01 | |
| parent | 800ad6ef9402543f80c73b1772d0ebcee7a6751b (diff) | |
* io.c (argf_to_io): should prefetch argv.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_6@3525 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | eval.c | 4 | ||||
| -rw-r--r-- | io.c | 1 |
3 files changed, 9 insertions, 1 deletions
@@ -18,6 +18,10 @@ Thu Feb 20 23:11:42 2003 Akinori MUSHA <[email protected]> * instruby.rb: Convert mdoc manpages to man for systems which nroff(1) does not grok mdoc. [merged from 1.8] +Tue Feb 18 21:39:27 2003 Yukihiro Matsumoto <[email protected]> + + * io.c (argf_to_io): should prefetch argv. + Fri Feb 14 14:25:24 2003 akira yamada <[email protected]> * lib/uri/generic.rb, lib/uri/ldap.rb, lib/uri/mailto.ldap: all foo=() @@ -47,6 +51,7 @@ Sat Feb 8 04:04:13 2003 Akinori MUSHA <[email protected]> lib/shell/error.rb, lib/shell/filter.rb: Fix typos and grammos. [approved by: keiju] +>>>>>>> 1.285.2.583 Mon Feb 3 23:46:48 2003 Yukihiro Matsumoto <[email protected]> * io.c (argf_getline): should not increment lineno at EOF. @@ -7891,7 +7891,9 @@ rb_thread_schedule() next->gid = 0; rb_thread_ready(next); next->status = THREAD_TO_KILL; - rb_thread_save_context(curr_thread); + if (!rb_thread_dead(curr_thread)) { + rb_thread_save_context(curr_thread); + } rb_thread_deadlock(); } next->wait_for = 0; @@ -3222,6 +3222,7 @@ argf_fileno() static VALUE argf_to_io() { + next_argv(); return current_file; } |