*** empty log message ***

git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@540 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 10 insertions, 0 deletions

diff --git a/parse.y b/parse.y
index 5e516d275..3365df467 100644
--- a/parse.y
+++ b/parse.y
@@ -1182,8 +1182,18 @@ primary		: literal
 		    }
 		  f_arglist
 		  compstmt
+		  rescue
+		  opt_else
+		  ensure
 		  kEND
 		    {
+		        if ($6) $5 = NEW_RESCUE($5, $6, $7);
+			else if ($7) {
+			    rb_warn("else without rescue is useless");
+			    $5 = block_append($5, $7);
+			}
+			if ($8) $5 = NEW_ENSURE($5, $8);
+
 		        /* NOEX_PRIVATE for toplevel */
 			$$ = NEW_DEFN($2, $4, $5, class_nest?0:1);
 		        fixpos($$, $4);