From 0310e20b361f63f812fed43e49160071309af942 Mon Sep 17 00:00:00 2001
From: yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 17 Dec 2008 06:17:11 +0000
Subject: merges r20770 from trunk into ruby_1_9_1. * parse.y (block_call):
 block should not be given to yield.   [ruby-core:20583]

git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@20823 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 parse.y | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'parse.y')

diff --git a/parse.y b/parse.y
index 189bcedfd..92dd38fc4 100644
--- a/parse.y
+++ b/parse.y
@@ -3497,7 +3497,12 @@ do_block	: keyword_do_block
 block_call	: command do_block
 		    {
 		    /*%%%*/
-			block_dup_check($1->nd_args, $2);
+			if (nd_type($1) == NODE_YIELD) {
+			    compile_error(PARSER_ARG "block given to yield");
+			}
+			else {
+			    block_dup_check($1->nd_args, $2);
+			}    
 			$2->nd_iter = $1;
 			$$ = $2;
 			fixpos($$, $1);
-- 
cgit