1 files changed, 10 insertions, 0 deletions
diff --git a/parse.y b/parse.y
index 7e4f1a3352..93a4bf6566 100644
--- a/parse.y
+++ b/parse.y
@@ -1353,8 +1353,18 @@ primary		: literal
 		    }
 		  f_arglist
 		  compstmt
+		  rescue
+		  opt_else
+		  ensure
 		  kEND
 		    {
+		        if ($9) $8 = NEW_RESCUE($8, $9, $10);
+			else if ($10) {
+			    rb_warn("else without rescue is useless");
+			    $8 = block_append($8, $10);
+			}
+			if ($11) $8 = NEW_ENSURE($8, $11);
+
 			$$ = NEW_DEFS($2, $5, $7, $8);
 		        fixpos($$, $2);
 		        local_pop();