From 790999028d75caa265cb66a8e44d200b8356ed8e Mon Sep 17 00:00:00 2001 From: nobu Date: Mon, 2 Apr 2007 12:54:42 +0000 Subject: [PATCH] * insns.def (throw), thread.c, yarvcore.h (throwed_errinfo): fixed typo. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12132 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ insns.def | 2 +- thread.c | 12 ++++++------ version.h | 8 ++++---- yarvcore.h | 2 +- 5 files changed, 17 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8cb084df35..4e01fdf0f8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Mon Apr 2 21:55:12 2007 Nobuyoshi Nakada + + * insns.def (throw), thread.c, yarvcore.h (throwed_errinfo): fixed + typo. + Fri Mar 30 11:46:51 2007 NAKAMURA Usaku * win32/win32.c (rb_w32_cmdvector): fixed buffer size. reported by diff --git a/insns.def b/insns.def index 801f94b97c..582e698d1d 100644 --- a/insns.def +++ b/insns.def @@ -1472,7 +1472,7 @@ throw pt = GET_LFP(); } else { - rb_bug("isns(throw): unsupport thorw type"); + rb_bug("isns(throw): unsupport throw type"); } } th->state = state; diff --git a/thread.c b/thread.c index 14c0c654bf..68fcf06294 100644 --- a/thread.c +++ b/thread.c @@ -240,7 +240,7 @@ terminate_i(st_data_t key, st_data_t val, rb_thread_t *main_thread) if (th != main_thread) { thread_debug("terminate_i: %p\n", th); rb_thread_interrupt(th); - th->throwed_errinfo = eTerminateSignal; + th->thrown_errinfo = eTerminateSignal; th->status = THREAD_TO_KILL; } else { @@ -690,9 +690,9 @@ rb_thread_execute_interrupts(rb_thread_t *th) } /* exception from another thread */ - if (th->throwed_errinfo) { - VALUE err = th->throwed_errinfo; - th->throwed_errinfo = 0; + if (th->thrown_errinfo) { + VALUE err = th->thrown_errinfo; + th->thrown_errinfo = 0; thread_debug("rb_thread_execute_interrupts: %ld\n", err); if (err == eKillSignal) { @@ -745,7 +745,7 @@ rb_thread_raise(int argc, VALUE *argv, rb_thread_t *th) exc = rb_make_exception(argc, argv); /* TODO: need synchronization if run threads in parallel */ - th->throwed_errinfo = exc; + th->thrown_errinfo = exc; rb_thread_ready(th); return Qnil; } @@ -865,7 +865,7 @@ rb_thread_kill(VALUE thread) thread_debug("rb_thread_kill: %p (%p)\n", th, (void *)th->thread_id); rb_thread_interrupt(th); - th->throwed_errinfo = eKillSignal; + th->thrown_errinfo = eKillSignal; th->status = THREAD_TO_KILL; return thread; diff --git a/version.h b/version.h index d30b65d196..40e2cc5ee8 100644 --- a/version.h +++ b/version.h @@ -1,15 +1,15 @@ #define RUBY_VERSION "1.9.0" -#define RUBY_RELEASE_DATE "2007-03-30" +#define RUBY_RELEASE_DATE "2007-04-02" #define RUBY_VERSION_CODE 190 -#define RUBY_RELEASE_CODE 20070330 +#define RUBY_RELEASE_CODE 20070402 #define RUBY_PATCHLEVEL 0 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_TEENY 0 #define RUBY_RELEASE_YEAR 2007 -#define RUBY_RELEASE_MONTH 3 -#define RUBY_RELEASE_DAY 30 +#define RUBY_RELEASE_MONTH 4 +#define RUBY_RELEASE_DAY 2 RUBY_EXTERN const char ruby_version[]; RUBY_EXTERN const char ruby_release_date[]; diff --git a/yarvcore.h b/yarvcore.h index 7eb6a8abb6..d0ff4127c5 100644 --- a/yarvcore.h +++ b/yarvcore.h @@ -422,7 +422,7 @@ struct rb_thread_struct VALUE value; VALUE errinfo; - VALUE throwed_errinfo; + VALUE thrown_errinfo; int exec_signal; int interrupt_flag;