diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-17 06:17:11 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-17 06:17:11 +0000 |
commit | d3ab1b9c274b9f0a40b3d71f087f5f8170ab2635 (patch) | |
tree | 274fa2914e1d8fe955bf8ca16a90522a699b47aa | |
parent | 83d929edb640ab8b585f76c182f41a55da360686 (diff) |
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: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@20823 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | parse.y | 7 |
2 files changed, 11 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Tue Dec 16 09:14:28 2008 Yukihiro Matsumoto <matz@ruby-lang.org> + + * parse.y (block_call): block should not be given to yield. + [ruby-core:20583] + Mon Dec 15 23:48:39 2008 Yukihiro Matsumoto <matz@ruby-lang.org> * thread.c (sleep_timeval): cast tv_usec to long to shut up @@ -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); |