1 files changed, 254 insertions, 9 deletions
diff --git a/spec/ruby/language/return_spec.rb b/spec/ruby/language/return_spec.rb
index 323f74aad3..36a3cba4d7 100644
--- a/spec/ruby/language/return_spec.rb
+++ b/spec/ruby/language/return_spec.rb
@@ -1,5 +1,5 @@
-require File.expand_path('../../spec_helper', __FILE__)
-require File.expand_path('../fixtures/return', __FILE__)
+require_relative '../spec_helper'
+require_relative 'fixtures/return'
 
 describe "The return keyword" do
   it "returns any object directly" do
@@ -19,12 +19,19 @@ describe "The return keyword" do
 
   it "returns nil by default" do
     def r; return; end
-    r().should be_nil
+    r().should == nil
   end
 
   describe "in a Thread" do
     it "raises a LocalJumpError if used to exit a thread" do
-      lambda { Thread.new { return }.join }.should raise_error(LocalJumpError)
+      t = Thread.new {
+        begin
+          return
+        rescue LocalJumpError => e
+          e
+        end
+      }
+      t.value.should.instance_of?(LocalJumpError)
     end
   end
 
@@ -152,7 +159,7 @@ describe "The return keyword" do
     end
 
     it "executes the ensure clause when begin/ensure are inside a lambda" do
-      lambda do
+      -> do
         begin
           return
         ensure
@@ -169,15 +176,15 @@ describe "The return keyword" do
     end
 
     it "causes lambda to return nil if invoked without any arguments" do
-      lambda { return; 456 }.call.should be_nil
+      -> { return; 456 }.call.should == nil
     end
 
     it "causes lambda to return nil if invoked with an empty expression" do
-      lambda { return (); 456 }.call.should be_nil
+      -> { return (); 456 }.call.should == nil
     end
 
     it "causes lambda to return the value passed to return" do
-      lambda { return 123; 456 }.call.should == 123
+      -> { return 123; 456 }.call.should == 123
     end
 
     it "causes the method that lexically encloses the block to return" do
@@ -222,7 +229,7 @@ describe "The return keyword" do
       def f
         1.times { 1.times {return true}; false}; false
       end
-      f.should be_true
+      f.should == true
     end
   end
 
@@ -242,4 +249,242 @@ describe "The return keyword" do
       ReturnSpecs::MethodWithBlock.new.method2.should == [0, 1, 2]
     end
   end
+
+  describe "at top level" do
+    before :each do
+      @filename = tmp("top_return.rb")
+      ScratchPad.record []
+    end
+
+    after do
+      rm_r @filename
+    end
+
+    it "stops file execution" do
+      ruby_exe(<<-END_OF_CODE).should == "before return\n"
+        puts "before return"
+        return
+
+        puts "after return"
+      END_OF_CODE
+
+      $?.exitstatus.should == 0
+    end
+
+    describe "within if" do
+      it "is allowed" do
+        File.write(@filename, <<-END_OF_CODE)
+          ScratchPad << "before if"
+          if true
+            return
+          end
+
+          ScratchPad << "after if"
+        END_OF_CODE
+
+        load @filename
+        ScratchPad.recorded.should == ["before if"]
+      end
+    end
+
+    describe "within while loop" do
+      it "is allowed" do
+        File.write(@filename, <<-END_OF_CODE)
+          ScratchPad << "before while"
+          while true
+            return
+          end
+
+          ScratchPad << "after while"
+        END_OF_CODE
+
+        load @filename
+        ScratchPad.recorded.should == ["before while"]
+      end
+    end
+
+    describe "within a begin" do
+      it "is allowed in begin block" do
+        File.write(@filename, <<-END_OF_CODE)
+          ScratchPad << "before begin"
+          begin
+            return
+          end
+
+          ScratchPad << "after begin"
+        END_OF_CODE
+
+        load @filename
+        ScratchPad.recorded.should == ["before begin"]
+      end
+
+      it "is allowed in ensure block" do
+        File.write(@filename, <<-END_OF_CODE)
+          ScratchPad << "before begin"
+          begin
+          ensure
+            return
+          end
+
+          ScratchPad << "after begin"
+        END_OF_CODE
+
+        load @filename
+        ScratchPad.recorded.should == ["before begin"]
+      end
+
+      it "is allowed in rescue block" do
+        File.write(@filename, <<-END_OF_CODE)
+          ScratchPad << "before begin"
+          begin
+            raise
+          rescue RuntimeError
+            return
+          end
+
+          ScratchPad << "after begin"
+        END_OF_CODE
+
+        load @filename
+        ScratchPad.recorded.should == ["before begin"]
+      end
+
+      it "fires ensure block before returning" do
+        ruby_exe(<<-END_OF_CODE).should == "within ensure\n"
+          begin
+            return
+          ensure
+            puts "within ensure"
+          end
+
+          puts "after begin"
+        END_OF_CODE
+      end
+
+      it "fires ensure block before returning while loads file" do
+        File.write(@filename, <<-END_OF_CODE)
+          ScratchPad << "before begin"
+          begin
+            return
+          ensure
+            ScratchPad << "within ensure"
+          end
+
+          ScratchPad << "after begin"
+        END_OF_CODE
+
+        load @filename
+        ScratchPad.recorded.should == ["before begin", "within ensure"]
+      end
+
+      it "swallows exception if returns in ensure block" do
+        File.write(@filename, <<-END_OF_CODE)
+          begin
+            raise
+          ensure
+            ScratchPad << "before return"
+            return
+          end
+        END_OF_CODE
+
+        load @filename
+        ScratchPad.recorded.should == ["before return"]
+      end
+    end
+
+    describe "within a block" do
+      it "is allowed" do
+        File.write(@filename, <<-END_OF_CODE)
+          ScratchPad << "before call"
+          proc { return }.call
+
+          ScratchPad << "after call"
+        END_OF_CODE
+
+        load @filename
+        ScratchPad.recorded.should == ["before call"]
+      end
+    end
+
+    describe "within a class" do
+      it "raises a SyntaxError" do
+        File.write(@filename, <<-END_OF_CODE)
+          class ReturnSpecs::A
+            ScratchPad << "before return"
+            return
+
+            ScratchPad << "after return"
+          end
+        END_OF_CODE
+
+        -> { load @filename }.should.raise(SyntaxError)
+      end
+    end
+
+    describe "within a block within a class" do
+      it "is not allowed" do
+        File.write(@filename, <<-END_OF_CODE)
+          class ReturnSpecs::A
+            ScratchPad << "before return"
+            1.times { return }
+            ScratchPad << "after return"
+          end
+        END_OF_CODE
+
+        -> { load @filename }.should.raise(LocalJumpError)
+      end
+    end
+
+    describe "within BEGIN" do
+      it "is allowed" do
+        File.write(@filename, <<-END_OF_CODE)
+          BEGIN {
+            ScratchPad << "before call"
+            return
+            ScratchPad << "after call"
+          }
+        END_OF_CODE
+
+        load @filename
+        ScratchPad.recorded.should == ["before call"]
+      end
+    end
+
+    describe "file loading" do
+      it "stops file loading and execution" do
+        File.write(@filename, <<-END_OF_CODE)
+          ScratchPad << "before return"
+          return
+          ScratchPad << "after return"
+        END_OF_CODE
+
+        load @filename
+        ScratchPad.recorded.should == ["before return"]
+      end
+    end
+
+    describe "file requiring" do
+      it "stops file loading and execution" do
+        File.write(@filename, <<-END_OF_CODE)
+          ScratchPad << "before return"
+          return
+          ScratchPad << "after return"
+        END_OF_CODE
+
+        require @filename
+        ScratchPad.recorded.should == ["before return"]
+      end
+    end
+
+    describe "return with argument" do
+      it "warns but does not affect exit status" do
+        err = ruby_exe(<<-END_OF_CODE, args: "2>&1")
+          return 10
+        END_OF_CODE
+        $?.exitstatus.should == 0
+
+        err.should =~ /warning: argument of top-level return is ignored/
+      end
+    end
+  end
 end