diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2003-11-16 09:11:01 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2003-11-16 09:11:01 +0000 |
commit | 4e2fd6be8d1d731eb83de0de3f21382296e674c9 (patch) | |
tree | 9996edd0073c606ae91921bed841b70a61e883cf /eval.c | |
parent | 1fc7d20da2b39f926c16c1d65ac90fcf37eb3466 (diff) |
* eval.c (rb_eval): iterator should return value from next inside
begin/rescue/end. (ruby-bugs:PR#1218)
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@4969 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'eval.c')
-rw-r--r-- | eval.c | 9 |
1 files changed, 8 insertions, 1 deletions
@@ -2862,6 +2862,7 @@ rb_eval(self, n) } else if (state != TAG_RAISE) { ruby_errinfo = e_info; + result = prot_tag->retval; } } else if (state == TAG_RAISE) { @@ -2880,8 +2881,14 @@ rb_eval(self, n) resq = resq->nd_head; /* next rescue */ } } + else { + result = prot_tag->retval; + } POP_TAG(); - if (state) JUMP_TAG(state); + if (state) { + if (state == TAG_NEXT) prot_tag->retval = result; + JUMP_TAG(state); + } /* no exception raised */ if (!rescuing && (node = node->nd_else)) { /* else clause given */ goto again; |