[GR-15311] Allow rescue/else/ensure clauses in do...end blocks.

PullRequest: truffleruby/809

Author: chrisseaton

CHANGELOG.md

@@ -25,6 +25,7 @@ Compatibility:
 * `StringScanner` will now match a regexp beginning with `^` even when not scanning from the start of the string.
 * `Module#define_method` is now public like in MRI.
 * `Kernel#warn` now supports the `uplevel:` keyword argument.
+* `do...end` blocks can now have `rescue/else/ensure` clauses like MRI (#1618).
 
 # 1.0 RC 15, 5 April 2019
 

spec/ruby/language/block_spec.rb

@@ -217,6 +217,12 @@ def m(a) yield a end
     it "does not raise an exception when values are yielded" do
       @y.s(0) { 1 }.should == 1
     end
+
+    ruby_version_is "2.5" do
+      it "may include a rescue clause" do
+        eval("@y.z do raise ArgumentError; rescue ArgumentError; 7; end").should == 7
+      end
+    end
   end
 
   describe "taking || arguments" do
@@ -227,6 +233,12 @@ def m(a) yield a end
     it "does not raise an exception when values are yielded" do
       @y.s(0) { || 1 }.should == 1
     end
+
+    ruby_version_is "2.5" do
+      it "may include a rescue clause" do
+        eval('@y.z do || raise ArgumentError; rescue ArgumentError; 7; end').should == 7
+      end
+    end
   end
 
   describe "taking |a| arguments" do
@@ -252,6 +264,12 @@ def m(a) yield a end
     it "does not destructure a single Array value" do
       @y.s([1, 2]) { |a| a }.should == [1, 2]
     end
+
+    ruby_version_is "2.5" do
+      it "may include a rescue clause" do
+        eval('@y.s(1) do |x| raise ArgumentError; rescue ArgumentError; 7; end').should == 7
+      end
+    end
   end
 
   describe "taking |a, b| arguments" do

spec/ruby/language/lambda_spec.rb

@@ -22,6 +22,12 @@ def create_lambda
     -> () { }.lambda?.should be_true
   end
 
+  ruby_version_is "2.5" do
+    it "may include a rescue clause" do
+      eval('-> do raise ArgumentError; rescue ArgumentError; 7; end').should be_an_instance_of(Proc)
+    end
+  end
+
   it "has its own scope for local variables" do
     l = -> arg {
       var = arg
@@ -305,6 +311,13 @@ def obj.define
     lambda { lambda }.should raise_error(ArgumentError)
   end
 
+  ruby_version_is "2.5" do
+    it "may include a rescue clause" do
+      eval('lambda do raise ArgumentError; rescue ArgumentError; 7; end').should be_an_instance_of(Proc)
+    end
+  end
+
+
   context "with an implicit block" do
     before do
       def meth; lambda; end

spec/tags/language/ensure_tags.txt

@@ -1,3 +1,2 @@
 fails:The rescue keyword allows 'rescue' in method arguments
 fails:The rescue keyword raises SyntaxError when else is used without rescue and ensure
-fails:The rescue keyword allows rescue in 'do end' block

spec/tags/language/rescue_tags.txt

@@ -1742,13 +1742,13 @@ f_larglist      : tLPAREN2 f_args opt_bv_decl tRPAREN {
 lambda_body     : tLAMBEG compstmt tRCURLY {
                     $$ = $2;
                 }
-                | kDO_LAMBDA compstmt kEND {
+                | kDO_LAMBDA bodystmt kEND {
                     $$ = $2;
                 }
 
 do_block        : kDO_BLOCK {
                     support.pushBlockScope();
-                } opt_block_param compstmt kEND {
+                } opt_block_param bodystmt kEND {
                     $$ = new IterParseNode($1, $3, $4, support.getCurrentScope());
                     support.popCurrentScope();
                 }
@@ -1826,7 +1826,7 @@ brace_block     : tLCURLY {
                 }
                 | kDO {
                     support.pushBlockScope();
-                } opt_block_param compstmt kEND {
+                } opt_block_param bodystmt kEND {
                     $$ = new IterParseNode($1, $3, $4, support.getCurrentScope());
                     support.popCurrentScope();
                 }

src/main/java/org/truffleruby/parser/parser/RubyParser.java

@@ -21,11 +21,6 @@
 exclude :test_keyword_invalid_name, "needs investigation"
 exclude :test_methoddef_in_cond, "needs investigation"
 exclude :test_parenthesised_statement_argument, "needs investigation"
-exclude :test_rescue_do_end_raised, "needs investigation"
 exclude :test_return_toplevel, "needs investigation"
 exclude :test_heredoc_newline, "needs investigation"
 exclude :test_method_call_location, "needs investigation"
-exclude :test_rescue_do_end_ensure_in_lambda, "needs investigation"
-exclude :test_rescue_do_end_ensure_result, "needs investigation"
-exclude :test_rescue_do_end_no_raise, "needs investigation"
-exclude :test_rescue_do_end_rescued, "needs investigation"