summaryrefslogtreecommitdiffstats
path: root/eval.c
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-10-27 10:19:57 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-10-27 10:19:57 +0000
commit0dac46932cf5ae0e9b082087e49e726f2095697c (patch)
treeb8d389c3ba79855d836f4a73f83ab476fabeb510 /eval.c
parenta1bd1dfebdf490e56d3195f1f9a5e013706ea9e9 (diff)
downloadruby-0dac46932cf5ae0e9b082087e49e726f2095697c.tar.gz
ruby-0dac46932cf5ae0e9b082087e49e726f2095697c.tar.xz
ruby-0dac46932cf5ae0e9b082087e49e726f2095697c.zip
* eval.c (rb_longjmp): ignore reentering error while warning.
[ruby-dev:21730] git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@4847 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'eval.c')
-rw-r--r--eval.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/eval.c b/eval.c
index 06590c0dd..59fe9c378 100644
--- a/eval.c
+++ b/eval.c
@@ -3949,7 +3949,10 @@ rb_longjmp(tag, mesg)
RSTRING(e)->ptr);
}
POP_TAG();
- if (status) {
+ if (status == TAG_FATAL && ruby_errinfo == exception_error) {
+ ruby_errinfo = Qnil;
+ }
+ else if (status) {
thread_reset_raised();
JUMP_TAG(status);
}