A resque body now returns the last expression evaluated (fixes #302)

adambeynon · adambeynon · commit afa8cb9f1d3b · 2013-07-29T21:10:08.000+01:00
diff --git a/lib/opal/parser.rb b/lib/opal/parser.rb
@@ -382,6 +382,10 @@ def returns(sexp)
         sexp
       when :rescue
         sexp[1] = returns sexp[1]
+
+        if sexp[2] and sexp[2][0] == :resbody and sexp[2][2]
+          sexp[2][2] = returns sexp[2][2]
+        end
         sexp
       when :ensure
         sexp[1] = returns sexp[1]
diff --git a/spec/opal/language/rescue_spec.rb b/spec/opal/language/rescue_spec.rb
@@ -0,0 +1,27 @@
+require 'spec_helper'
+
+class RescueReturningSpec
+  def single
+    begin
+      raise "ERROR"
+    rescue
+      :foo
+    end
+  end
+
+  def multiple
+    begin
+      raise "ERROR"
+    rescue
+      to_s
+      :bar
+    end
+  end
+end
+
+describe "The rescue keyword" do
+  it "returns last value of expression evaluated" do
+    RescueReturningSpec.new.single.should == :foo
+    RescueReturningSpec.new.multiple.should == :bar
+  end
+end
