1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* eval.c (rb_longjmp): reset raised flag before fatal error.

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@24401 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2009-08-05 03:39:29 +00:00
parent d857a1b0d7
commit 0a2b36a99c
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -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> Wed Aug 5 10:20:39 2009 NARUSE, Yui <naruse@ruby-lang.org>
* re.c (rb_reg_preprocess_dregexp): add options to arguments. * re.c (rb_reg_preprocess_dregexp): add options to arguments.

1
eval.c
View File

@ -345,6 +345,7 @@ rb_longjmp(int tag, volatile VALUE mesg)
if (rb_threadptr_set_raised(th)) { if (rb_threadptr_set_raised(th)) {
th->errinfo = exception_error; th->errinfo = exception_error;
rb_threadptr_reset_raised(th);
JUMP_TAG(TAG_FATAL); JUMP_TAG(TAG_FATAL);
} }

8
eval_error.c
View File

@ -87,10 +87,12 @@ error_print(void)
if (NIL_P(errat)) { if (NIL_P(errat)) {
const char *file = rb_sourcefile(); const char *file = rb_sourcefile();
int line = rb_sourceline(); int line = rb_sourceline();
if (file) if (!file)
warn_printf("%s:%d", file, line);
else
warn_printf("%d", line); 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) { else if (RARRAY_LEN(errat) == 0) {
error_pos(); error_pos();