* vm.c (th_yield_setup_args): |v| should work as |v,|.

  ex) def m;yield 1, 2; end; m{|v| p v} #=> 1
* parse.y: apply above change for "for" statement.
* test/ruby/test_assignment.rb: ditto
* test/ruby/test_basicinstructions.rb: ditto.
* test/ruby/test_iterator.rb: ditto.
* test/ruby/test_yield.rb: ditto.
* compile.c (iseq_compile_each): fix debug.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12544 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 38 insertions, 4 deletions

diff --git a/parse.y b/parse.y
index 455a69e0f4..21d9fd1f53 100644
--- a/parse.y
+++ b/parse.y
@@ -2691,12 +2691,46 @@ primary		: literal
 		  keyword_end
 		    {
 		    /*%%%*/
+			/*
+			 *  for a, b, c in e
+			 *  #=>
+			 *  e.each{|*x| a, b, c = x
+			 *
+			 *  for a in e
+			 *  #=>
+			 *  e.each{|x| a, = x}
+			 */
 			ID id = internal_id();
 			ID *tbl = ALLOC_N(ID, 2);
-			NODE *args =new_args(NEW_NODE(NODE_ARGS_AUX, 0, 1 /* nd_plen */,
-						      node_assign($2, NEW_DVAR(id))),
-					     0, 0, 0, 0);
-			NODE *scope = NEW_NODE(NODE_SCOPE, tbl, $8, args);
+			NODE *m = NEW_ARGS_AUX(0, 0);
+			NODE *args, *scope;
+
+			if (nd_type($2) == NODE_MASGN) {
+			    /* if args.length == 1 && args[0].kind_of?(Array)
+			     *   args = args[0]
+			     * end
+			     */
+			    NODE *one = NEW_LIST(NEW_LIT(INT2FIX(1)));
+			    NODE *zero = NEW_LIST(NEW_LIT(INT2FIX(0)));
+			    m->nd_next = block_append(
+				NEW_IF(cond(
+				    NEW_NODE(NODE_AND,
+					     NEW_CALL(NEW_CALL(NEW_DVAR(id), rb_intern("length"), 0),
+						      rb_intern("=="), one),
+					     NEW_CALL(NEW_CALL(NEW_DVAR(id), rb_intern("[]"), zero),
+						      rb_intern("kind_of?"), NEW_LIST(NEW_LIT(rb_cArray))),
+					     0)),
+					NEW_DASGN_CURR(id,
+						       NEW_CALL(NEW_DVAR(id), rb_intern("[]"), zero)),
+					0),
+				node_assign($2, NEW_DVAR(id)));
+			}
+			else {
+			    m->nd_next = node_assign(NEW_MASGN(NEW_LIST($2), 0), NEW_DVAR(id));
+			}
+
+			args = new_args(m, 0, id, 0, 0);
+			scope = NEW_NODE(NODE_SCOPE, tbl, $8, args);
 			tbl[0] = 1; tbl[1] = id;
 			$$ = NEW_FOR(0, $5, scope);
 			fixpos($$, $2);