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_jump.c (rb_f_catch): Resotre cfp if catched thrown object.

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14870 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
ko1 2008-01-03 11:26:48 +00:00
parent 37d1059f49
commit a0350e5964
2 changed files with 6 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
Thu Jan 3 20:24:48 2008 Koichi Sasada <ko1@atdot.net>
* eval_jump.c (rb_f_catch): Resotre cfp if catched thrown object.
Thu Jan 3 19:45:57 2008 Koichi Sasada <ko1@atdot.net> Thu Jan 3 19:45:57 2008 Koichi Sasada <ko1@atdot.net>
* bootstraptest/test_eval.rb, test_knownbug.rb: move a fixed test. * bootstraptest/test_eval.rb, test_knownbug.rb: move a fixed test.

2
eval_jump.c
View file

@ -105,6 +105,7 @@ rb_f_catch(int argc, VALUE *argv)
int state; int state;
VALUE val = Qnil; /* OK */ VALUE val = Qnil; /* OK */
rb_thread_t *th = GET_THREAD(); rb_thread_t *th = GET_THREAD();
rb_control_frame_t *saved_cfp = th->cfp;
rb_scan_args(argc, argv, "01", &tag); rb_scan_args(argc, argv, "01", &tag);
if (argc == 0) { if (argc == 0) {
@ -118,6 +119,7 @@ rb_f_catch(int argc, VALUE *argv)
val = rb_yield_0(1, &tag); val = rb_yield_0(1, &tag);
} }
else if (state == TAG_THROW && RNODE(th->errinfo)->u1.value == tag) { else if (state == TAG_THROW && RNODE(th->errinfo)->u1.value == tag) {
th->cfp = saved_cfp;
val = th->tag->retval; val = th->tag->retval;
th->errinfo = Qnil; th->errinfo = Qnil;
state = 0; state = 0;