mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* eval.c (rb_longjmp): source file information may be NULL.
[ruby-dev:31849] * eval.c (ruby_finalize_0): clear trace_func before finalization. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13510 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
c1a432a7d9
commit
72ea36112c
3 changed files with 21 additions and 7 deletions
|
@ -1,3 +1,10 @@
|
|||
Tue Sep 25 09:51:31 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
|
||||
|
||||
* eval.c (rb_longjmp): source file information may be NULL.
|
||||
[ruby-dev:31849]
|
||||
|
||||
* eval.c (ruby_finalize_0): clear trace_func before finalization.
|
||||
|
||||
Mon Sep 24 22:36:13 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
|
||||
|
||||
* array.c (rb_ary_equal): should handle recursive array.
|
||||
|
|
15
eval.c
15
eval.c
|
@ -130,6 +130,7 @@ ruby_options(int argc, char **argv)
|
|||
static void
|
||||
ruby_finalize_0(void)
|
||||
{
|
||||
rb_clear_trace_func();
|
||||
PUSH_TAG();
|
||||
if (EXEC_TAG() == 0) {
|
||||
rb_trap_exit();
|
||||
|
@ -143,7 +144,6 @@ ruby_finalize_1(void)
|
|||
{
|
||||
signal(SIGINT, SIG_DFL);
|
||||
GET_THREAD()->errinfo = Qnil;
|
||||
rb_clear_trace_func();
|
||||
rb_gc_call_finalizer_at_exit();
|
||||
}
|
||||
|
||||
|
@ -686,9 +686,16 @@ rb_longjmp(int tag, VALUE mesg)
|
|||
PUSH_TAG();
|
||||
if ((status = EXEC_TAG()) == 0) {
|
||||
RB_GC_GUARD(e) = rb_obj_as_string(e);
|
||||
warn_printf("Exception `%s' at %s:%d - %s\n",
|
||||
rb_obj_classname(th->errinfo),
|
||||
file, line, RSTRING_PTR(e));
|
||||
if (file) {
|
||||
warn_printf("Exception `%s' at %s:%d - %s\n",
|
||||
rb_obj_classname(th->errinfo),
|
||||
file, line, RSTRING_PTR(e));
|
||||
}
|
||||
else {
|
||||
warn_printf("Exception `%s' - %s\n",
|
||||
rb_obj_classname(th->errinfo),
|
||||
RSTRING_PTR(e));
|
||||
}
|
||||
}
|
||||
POP_TAG();
|
||||
if (status == TAG_FATAL && th->errinfo == exception_error) {
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
#define RUBY_VERSION "1.9.0"
|
||||
#define RUBY_RELEASE_DATE "2007-09-24"
|
||||
#define RUBY_RELEASE_DATE "2007-09-25"
|
||||
#define RUBY_VERSION_CODE 190
|
||||
#define RUBY_RELEASE_CODE 20070924
|
||||
#define RUBY_RELEASE_CODE 20070925
|
||||
#define RUBY_PATCHLEVEL 0
|
||||
|
||||
#define RUBY_VERSION_MAJOR 1
|
||||
|
@ -9,7 +9,7 @@
|
|||
#define RUBY_VERSION_TEENY 0
|
||||
#define RUBY_RELEASE_YEAR 2007
|
||||
#define RUBY_RELEASE_MONTH 9
|
||||
#define RUBY_RELEASE_DAY 24
|
||||
#define RUBY_RELEASE_DAY 25
|
||||
|
||||
#ifdef RUBY_EXTERN
|
||||
RUBY_EXTERN const char ruby_version[];
|
||||
|
|
Loading…
Add table
Reference in a new issue