mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* eval.c (rb_longjmp): reset raised flag before fatal error.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@24401 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
d857a1b0d7
commit
0a2b36a99c
3 changed files with 10 additions and 3 deletions
|
@ -1,3 +1,7 @@
|
|||
Wed Aug 5 12:39:23 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||
|
||||
* eval.c (rb_longjmp): reset raised flag before fatal error.
|
||||
|
||||
Wed Aug 5 10:20:39 2009 NARUSE, Yui <naruse@ruby-lang.org>
|
||||
|
||||
* re.c (rb_reg_preprocess_dregexp): add options to arguments.
|
||||
|
|
1
eval.c
1
eval.c
|
@ -345,6 +345,7 @@ rb_longjmp(int tag, volatile VALUE mesg)
|
|||
|
||||
if (rb_threadptr_set_raised(th)) {
|
||||
th->errinfo = exception_error;
|
||||
rb_threadptr_reset_raised(th);
|
||||
JUMP_TAG(TAG_FATAL);
|
||||
}
|
||||
|
||||
|
|
|
@ -87,10 +87,12 @@ error_print(void)
|
|||
if (NIL_P(errat)) {
|
||||
const char *file = rb_sourcefile();
|
||||
int line = rb_sourceline();
|
||||
if (file)
|
||||
warn_printf("%s:%d", file, line);
|
||||
else
|
||||
if (!file)
|
||||
warn_printf("%d", line);
|
||||
else if (!line)
|
||||
warn_printf("%s", file, line);
|
||||
else
|
||||
warn_printf("%s:%d", file, line);
|
||||
}
|
||||
else if (RARRAY_LEN(errat) == 0) {
|
||||
error_pos();
|
||||
|
|
Loading…
Add table
Reference in a new issue