From 2cd6d0f5971b3b5b5d7178e2e7b44b718b4bd36b Mon Sep 17 00:00:00 2001 From: matz Date: Thu, 20 Feb 2003 10:09:31 +0000 Subject: * eval.c (rb_thread_remove): thread may die in the process of rb_thread_die(). this change was suggested by Rudi Cilibrasi . * eval.c (rb_thread_start_0): main thread swapped by fork() may terminate rb_thread_start_0() successfully. call ruby_stop(0); this change too was suggested by Rudi. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3514 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 10 ++++++++++ eval.c | 2 ++ parse.y | 2 +- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index c072148bb6..3031c5ccce 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +Thu Feb 20 19:05:51 2003 Yukihiro Matsumoto + + * eval.c (rb_thread_remove): thread may die in the process of + rb_thread_die(). this change was suggested by Rudi Cilibrasi + . + + * eval.c (rb_thread_start_0): main thread swapped by fork() may + terminate rb_thread_start_0() successfully. call ruby_stop(0); + this change too was suggested by Rudi. + Thu Feb 20 18:44:51 2003 Nobuyoshi Nakada * file.c (file_expand_path): fix wrong behavior for root file. diff --git a/eval.c b/eval.c index 37923ecdea..4c5c0b55bf 100644 --- a/eval.c +++ b/eval.c @@ -7980,6 +7980,7 @@ rb_thread_remove(th) rb_thread_ready(th); rb_thread_die(th); + if (th->status == THREAD_KILLED) return; /* died in process */ th->prev->next = th->next; th->next->prev = th->prev; } @@ -9004,6 +9005,7 @@ rb_thread_start_0(fn, arg, th_arg) } } rb_thread_schedule(); + ruby_stop(0); /* last thread termination */ return 0; /* not reached */ } diff --git a/parse.y b/parse.y index b848fe71e7..ea581fa47d 100644 --- a/parse.y +++ b/parse.y @@ -3700,7 +3700,7 @@ yylex() } pushback(c); if (ISDIGIT(c)) { - rb_warn("no . floating literal anymore; put 0 before dot"); + rb_warning("no . floating literal anymore; put 0 before dot"); } lex_state = EXPR_DOT; return '.'; -- cgit v1.2.3