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

* eval.c (rb_longjmp): ignore reentering error while warning.

Browse Source 
[ruby-dev:21730]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@4847 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2003-10-27 10:19:57 +00:00
parent d1d617b4a2
commit ed5208d851
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Mon Oct 27 19:19:55 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
* eval.c (rb_longjmp): ignore reentering error while warning.
[ruby-dev:21730]
Mon Oct 27 00:23:50 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp> Mon Oct 27 00:23:50 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tcltklib/tcltklib.c (ip_ruby): bug fix on Win : hang-up when * ext/tcltklib/tcltklib.c (ip_ruby): bug fix on Win : hang-up when

5
eval.c
View File

@ -3949,7 +3949,10 @@ rb_longjmp(tag, mesg)
RSTRING(e)->ptr); RSTRING(e)->ptr);
} }
POP_TAG(); POP_TAG();
if (status) { if (status == TAG_FATAL && ruby_errinfo == exception_error) {
ruby_errinfo = Qnil;
}
else if (status) {
thread_reset_raised(); thread_reset_raised();
JUMP_TAG(status); JUMP_TAG(status);
} }