@@ -118,61 +118,88 @@ describe "The return keyword" do
end
describe "within a begin" do
- it "executes ensure before returning from function" do
- def f(a)
+ before :each do
+ ScratchPad.record []
+ end
+
+ it "executes ensure before returning" do
+ def f()
begin
- return a
+ ScratchPad << :begin
+ return :begin
+ ScratchPad << :after_begin
ensure
- a << 1
+ ScratchPad << :ensure
end
+ ScratchPad << :function
end
- f([]).should == [1]
+ f().should == :begin
+ ScratchPad.recorded.should == [:begin, :ensure]
end
- it "executes return in ensure before returning from function" do
- def f(a)
+ it "returns last value returned in ensure" do
+ def f()
begin
- return a
+ ScratchPad << :begin
+ return :begin
+ ScratchPad << :after_begin
ensure
- return [0]
- a << 1
+ ScratchPad << :ensure
+ return :ensure
+ ScratchPad << :after_ensure
end
+ ScratchPad << :function
end
- f([]).should == [0]
+ f().should == :ensure
+ ScratchPad.recorded.should == [:begin, :ensure]
end
- it "executes ensures in stack order before returning from function" do
- def f(a)
+ it "executes nested ensures before returning" do
+ def f()
begin
begin
- return a
+ ScratchPad << :inner_begin
+ return :inner_begin
+ ScratchPad << :after_inner_begin
ensure
- a << 2
+ ScratchPad << :inner_ensure
end
+ ScratchPad << :outer_begin
+ return :outer_begin
+ ScratchPad << :after_outer_begin
ensure
- a << 1
+ ScratchPad << :outer_ensure
end
+ ScratchPad << :function
end
- f([]).should == [2,1]
+ f().should == :inner_begin
+ ScratchPad.recorded.should == [:inner_begin, :inner_ensure, :outer_ensure]
end
- it "executes return at base of ensure stack" do
- def f(a)
+ it "returns last value returned in nested ensures" do
+ def f()
begin
begin
- return a
+ ScratchPad << :inner_begin
+ return :inner_begin
+ ScratchPad << :after_inner_begin
ensure
- a << 2
- return 2
+ ScratchPad << :inner_ensure
+ return :inner_ensure
+ ScratchPad << :after_inner_ensure
end
+ ScratchPad << :outer_begin
+ return :outer_begin
+ ScratchPad << :after_outer_begin
ensure
- a << 1
- return 1
+ ScratchPad << :outer_ensure
+ return :outer_ensure
+ ScratchPad << :after_outer_ensure
end
+ ScratchPad << :function
end
- a = []
- f(a).should == 1
- a.should == [2, 1]
+ f().should == :outer_ensure
+ ScratchPad.recorded.should == [:inner_begin, :inner_ensure, :outer_ensure]
end
end
language/return_spec.rb
8e099b36ca56d97c8b7a77388c009bdf4de30134
Charles Comstock
clgc@consistency.cgs.wustl.edu
http://github.com/rubyspec/rubyspec/commit/bd16a4301de66d27c9ddf87edb2f6bd569024841
bd16a4301de66d27c9ddf87edb2f6bd569024841
2009-09-29T16:30:18-07:00
2009-09-29T16:30:18-07:00
Return from within a begin was not checking all exit paths from the function
and updated specs to use ScratchPad
03cbb4898e5a27262f70cd4f55d208801c57bd59
Charles Comstock
clgc@consistency.cgs.wustl.edu