kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* eval.c (rb_protect): restore cfp ([ruby-dev:30671]).

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12171 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
ko1 2007-04-12 07:08:28 +00:00
parent baeb828c03
commit cc3871f9dc
2 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
Thu Apr 12 16:06:48 2007 Koichi Sasada <ko1@atdot.net>
* eval.c (rb_protect): restore cfp ([ruby-dev:30671]).
Thu Apr 12 16:04:31 2007 Koichi Sasada <ko1@atdot.net> Thu Apr 12 16:04:31 2007 Koichi Sasada <ko1@atdot.net>
* compile.c (iseq_compile_each): check node->nd_state == 1, not !0. * compile.c (iseq_compile_each): check node->nd_state == 1, not !0.

4
eval.c
View file

@ -1390,16 +1390,20 @@ rb_protect(VALUE (*proc) (VALUE), VALUE data, int *state)
{ {
VALUE result = Qnil; /* OK */ VALUE result = Qnil; /* OK */
int status; int status;
rb_thread_t *th = GET_THREAD();
rb_control_frame_t *cfp = th->cfp;
PUSH_THREAD_TAG(); PUSH_THREAD_TAG();
if ((status = EXEC_TAG()) == 0) { if ((status = EXEC_TAG()) == 0) {
result = (*proc) (data); result = (*proc) (data);
} }
POP_THREAD_TAG(); POP_THREAD_TAG();
if (state) { if (state) {
*state = status; *state = status;
} }
if (status != 0) { if (status != 0) {
th->cfp = cfp;
return Qnil; return Qnil;
} }