From 8d74e302ba7b5520de0e7e35fb69c82fe8952fd3 Mon Sep 17 00:00:00 2001 From: yugui Date: Sat, 8 Aug 2009 15:34:03 +0000 Subject: merges r24401 from trunk into ruby_1_9_1. -- * eval.c (rb_longjmp): reset raised flag before fatal error. * eval_error.c (error_print): file can be NULL. line can be 0. git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@24467 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- eval_error.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'eval_error.c') diff --git a/eval_error.c b/eval_error.c index 622ae4fdd..65f1f4a7b 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); + else + warn_printf("%s:%d", file, line); } else if (RARRAY_LEN(errat) == 0) { error_pos(); -- cgit