opal · Nov 28, 2014 · Nov 28, 2014
Showing with 43 additions and 11 deletions.

+2 −0 CHANGELOG.md

+0 −9 README.md

+10 −2 lib/opal/nodes/rescue.rb

+8 −0 spec/README.md

+23 −0 spec/opal/core/language_spec.rb
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,7 @@
 ## edge (upcoming 0.7)
 
+*   Fix `begin`/`rescue` blocks to evaluate to last expression.
+
 *   Add support for `RUBY_ENGINE/RUBY_PLATFORM != "opal"` pre-processor directives.
 
         if RUBY_ENGINE != "opal"

diff --git a/README.md b/README.md
@@ -119,15 +119,6 @@ javascript.
 Holds the stdlib that opal currently supports. This includes Observable,
 StringScanner, Date, etc.
 
-### spec
-
-* **rubyspecs** (file) a whitelist of RubySpec files to be ran
-* **corelib** RubySpec examples (submodule)
-* **stdlib** `rubysl-*` examples (submodules)
-* **filters** The list of MSpec/RubySpec examples that are either bugs or unsupported
-* **opal** opal additions/special behaviour in the runtime/corelib
-* **cli** specs for opal lib (parser, lexer, grammar, compiler etc)
-
 ## Browser support
 
 * Internet Explorer 6+

diff --git a/lib/opal/nodes/rescue.rb b/lib/opal/nodes/rescue.rb
@@ -80,7 +80,13 @@ def compile
       end
 
       def body_code
-        body.type == :resbody ? s(:nil) : body
+        body_code = (body.type == :resbody ? s(:nil) : body)
+
+        if !stmt?
+          compiler.returns body_code
+        else
+          body_code
+        end
       end
     end
 
@@ -128,7 +134,9 @@ def rescue_exprs
       end
 
       def rescue_body
-        body || s(:nil)
+        body_code = (body || s(:nil))
+        body_code = compiler.returns(body_code) if !stmt?
+        body_code
       end
     end
   end

diff --git a/spec/README.md b/spec/README.md
@@ -0,0 +1,8 @@
+# Opal specs overview
+
+* **rubyspecs** (file) a whitelist of RubySpec files to be ran
+* **corelib** RubySpec examples (submodule)
+* **stdlib** `rubysl-*` examples (submodules)
+* **filters** The list of MSpec/RubySpec examples that are either bugs or unsupported
+* **opal** opal additions/special behaviour in the runtime/corelib
+* **lib** specs for opal lib (parser, lexer, grammar, compiler etc)
diff --git a/spec/opal/core/language_spec.rb b/spec/opal/core/language_spec.rb
@@ -0,0 +1,23 @@
+require 'spec_helper'
+
+describe "begin & rescue blocks" do
+  it "should evaluate to begin blocks last expression when no exception" do
+    result = begin
+      "a"
+    rescue
+      "b"
+    end
+
+    result.should == "a"
+  end
+
+  it "should evaluate to rescue blocks last expression when exception" do
+    result = begin
+      raise "foo"
+    rescue
+      "bar"
+    end
+
+    result.should == "bar"
+  end
+end