From ba413c78e011a8412bbd5f63aaed25e42d6293fc Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 16 Nov 2003 09:11:01 +0000
Subject: * eval.c (rb_eval): iterator should return value from next inside  
 begin/rescue/end.  (ruby-bugs:PR#1218)

git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@4969 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 eval.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'eval.c')

diff --git a/eval.c b/eval.c
index 4a582ded6..31c1033e7 100644
--- a/eval.c
+++ b/eval.c
@@ -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;
-- 
cgit