matz	2007-12-22 03:02:19 +0900 (Sat, 22 Dec 2007)

  New Revision: 14441

  Modified files:
    trunk/ChangeLog
    trunk/parse.y

  Log:
    * parse.y (command): block from cmd_brace_block was ignored.
      [ruby-dev:32644]

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/parse.y?r1=14441&r2=14440
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=14441&r2=14440

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 14440)
+++ ChangeLog	(revision 14441)
@@ -1,3 +1,8 @@
+Sat Dec 22 02:49:02 2007  Yukihiro Matsumoto  <matz@r...>
+
+	* parse.y (command): block from cmd_brace_block was ignored.
+	  [ruby-dev:32644]
+
 Sat Dec 22 01:52:11 2007  Yukihiro Matsumoto  <matz@r...>
 
 	* io.c (io_ungetc): avoid buffer relocation, which might cause
Index: parse.y
===================================================================
--- parse.y	(revision 14440)
+++ parse.y	(revision 14441)
@@ -1264,8 +1264,9 @@
 		| operation command_args cmd_brace_block
 		    {
 		    /*%%%*/
-			$$ = NEW_FCALL($1, $2);
 			block_dup_check($2,$3);
+		        $3->nd_iter = NEW_FCALL($1, $2);
+			$$ = $3;
 			fixpos($$, $2);
 		    /*%
 			$$ = dispatch2(command, $1, $2);
@@ -1284,8 +1285,9 @@
 		| primary_value '.' operation2 command_args cmd_brace_block
 		    {
 		    /*%%%*/
-			$$ = NEW_CALL($1, $3, $4);
 			block_dup_check($4,$5);
+		        $5->nd_iter = NEW_CALL($1, $3, $4);
+			$$ = $5;
 			fixpos($$, $1);
 		    /*%
 			$$ = dispatch4(command_call, $1, ripper_id2sym('.'), $3, $4);
@@ -1304,8 +1306,9 @@
 		| primary_value tCOLON2 operation2 command_args cmd_brace_block
 		    {
 		    /*%%%*/
-			$$ = NEW_CALL($1, $3, $4);
 			block_dup_check($4,$5);
+		        $5->nd_iter = NEW_CALL($1, $3, $4);
+			$$ = $5;
 			fixpos($$, $1);
 		    /*%
 			$$ = dispatch4(command_call, $1, ripper_intern("::"), $3, $4);

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml