diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-08-05 03:39:29 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-08-05 03:39:29 +0000 |
| commit | ae70e208a0f24d842a0d1c24385f04da9dab77f5 (patch) | |
| tree | 385b39a1a47f6c5a15d437e1845f91b5259e0fe4 /eval_error.c | |
| parent | aa9b093ff3ad058e844e7b23310b21beffcdfb04 (diff) | |
| download | ruby-ae70e208a0f24d842a0d1c24385f04da9dab77f5.tar.gz ruby-ae70e208a0f24d842a0d1c24385f04da9dab77f5.tar.xz ruby-ae70e208a0f24d842a0d1c24385f04da9dab77f5.zip | |
* eval.c (rb_longjmp): reset raised flag before fatal error.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@24401 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'eval_error.c')
| -rw-r--r-- | eval_error.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/eval_error.c b/eval_error.c index 85e55ad3c..809a66fea 100644 --- a/eval_error.c +++ b/eval_error.c @@ -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(); |