ruby · pasberth · Mar 5, 2012 · Mar 5, 2012 · Mar 5, 2012
diff --git a/parse.y b/parse.y
@@ -3874,6 +3874,30 @@ block_call	: command do_block
 			$$ = method_optarg($$, $4);
 		    %*/
 		    }
+		| block_call '.' operation2 opt_paren_args brace_block
+		    {
+		    /*%%%*/
+			block_dup_check($4,$5);
+		        $5->nd_iter = NEW_CALL($1, $3, $4);
+			$$ = $5;
+			fixpos($$, $1);
+		    /*%
+			$$ = dispatch4(command_call, $1, ripper_id2sym('.'), $3, $4);
+			$$ = method_add_block($$, $5);
+		    %*/
+		    }
+		| block_call '.' operation2 command_args do_block
+		    {
+		    /*%%%*/
+			block_dup_check($4,$5);
+		        $5->nd_iter = NEW_CALL($1, $3, $4);
+			$$ = $5;
+			fixpos($$, $1);
+		    /*%
+			$$ = dispatch4(command_call, $1, ripper_id2sym('.'), $3, $4);
+			$$ = method_add_block($$, $5);
+		    %*/
+		    }
 		;
 
 method_call	: operation

diff --git a/test/ruby/test_syntax.rb b/test/ruby/test_syntax.rb
@@ -61,6 +61,38 @@ def test_newline_in_block_parameters
       end
     end
   end
+
+  def test_do_block_after_do_block_without_parenthesis
+    assert_nothing_raised(SyntaxError) { eval(<<-CODE) }
+        ["elem"].each_with_object [] do
+        end.map do
+        end
+    CODE
+  end
+
+  def test_do_block_after_do_block_without_parenthesis2
+    assert_nothing_raised(SyntaxError) { eval(<<-CODE) }
+        ["elem"].each_with_object [] do
+        end.each_with_object [] do
+        end
+    CODE
+  end
+
+  def test_brace_block_after_do_block_without_parenthesis
+    assert_nothing_raised(SyntaxError) { eval(<<-CODE) }
+        ["elem"].each_with_object [] do
+        end.map {
+        }
+    CODE
+  end
+
+  def test_brace_block_after_do_block_without_parenthesis2
+    assert_nothing_raised(SyntaxError) { eval(<<-CODE) }
+        ["elem"].each_with_object [] do
+        end.each_with_object([]) {
+        }
+    CODE
+  end
 
   private