@@ -110,58 +110,128 @@ describe "Breaking out of a loop with a value" do a = loop do break [*[1,2]]; end; a.should == [1,2] end - it "assigns splatted objects" do - a = loop do break *nil; end; a.should == nil - a = loop do break *1; end; a.should == 1 - a = loop do break *[]; end; a.should == nil - a = loop do break *[1]; end; a.should == 1 - a = loop do break *[nil]; end; a.should == nil - a = loop do break *[[]]; end; a.should == [] - a = loop do break *[*[]]; end; a.should == nil - a = loop do break *[1]; end; a.should == 1 - a = loop do break *[*[1]]; end; a.should == 1 - a = loop do break *[1,2]; end; a.should == [1,2] - a = loop do break *[*[1,2]]; end; a.should == [1,2] - end - - it "assigns to a splatted reference" do - *a = loop do break; end; a.should == [nil] - *a = loop do break nil; end; a.should == [nil] - *a = loop do break 1; end; a.should == [1] - *a = loop do break []; end; a.should == [[]] - *a = loop do break [1]; end; a.should == [[1]] - *a = loop do break [nil]; end; a.should == [[nil]] - *a = loop do break [[]]; end; a.should == [[[]]] - *a = loop do break [1,2]; end; a.should == [[1,2]] - *a = loop do break [*[]]; end; a.should == [[]] - *a = loop do break [*[1]]; end; a.should == [[1]] - *a = loop do break [*[1,2]]; end; a.should == [[1,2]] - end - - it "assigns splatted objects to a splatted reference" do - *a = loop do break *nil; end; a.should == [nil] - *a = loop do break *1; end; a.should == [1] - *a = loop do break *[]; end; a.should == [nil] - *a = loop do break *[1]; end; a.should == [1] - *a = loop do break *[nil]; end; a.should == [nil] - *a = loop do break *[[]]; end; a.should == [[]] - *a = loop do break *[1,2]; end; a.should == [[1,2]] - *a = loop do break *[*[]]; end; a.should == [nil] - *a = loop do break *[*[1]]; end; a.should == [1] - *a = loop do break *[*[1,2]]; end; a.should == [[1,2]] - end - - it "assigns splatted objects to a splatted reference from a splatted loop" do - *a = *loop do break *nil; end; a.should == [nil] - *a = *loop do break *1; end; a.should == [1] - *a = *loop do break *[]; end; a.should == [nil] - *a = *loop do break *[1]; end; a.should == [1] - *a = *loop do break *[nil]; end; a.should == [nil] - *a = *loop do break *[[]]; end; a.should == [] - *a = *loop do break *[1,2]; end; a.should == [1,2] - *a = *loop do break *[*[]]; end; a.should == [nil] - *a = *loop do break *[*[1]]; end; a.should == [1] - *a = *loop do break *[*[1,2]]; end; a.should == [1,2] + ruby_version_is "" ... "1.9" do + it "assigns splatted objects" do + a = loop do break *nil; end; a.should == nil + a = loop do break *[]; end; a.should == nil + a = loop do break *1; end; a.should == 1 + a = loop do break *[1]; end; a.should == 1 + a = loop do break *[nil]; end; a.should == nil + a = loop do break *[[]]; end; a.should == [] + a = loop do break *[*[]]; end; a.should == nil + a = loop do break *[1]; end; a.should == 1 + a = loop do break *[*[1]]; end; a.should == 1 + a = loop do break *[1,2]; end; a.should == [1,2] + a = loop do break *[*[1,2]]; end; a.should == [1,2] + end + end + + ruby_version_is "1.9" do + it "assigns splatted objects" do + a = loop do break *nil; end; a.should == [] + a = loop do break *[]; end; a.should == [] + a = loop do break *1; end; a.should == [1] + a = loop do break *[1]; end; a.should == [1] + a = loop do break *[nil]; end; a.should == [nil] + a = loop do break *[[]]; end; a.should == [[]] + a = loop do break *[*[]]; end; a.should == [] + a = loop do break *[1]; end; a.should == [1] + a = loop do break *[*[1]]; end; a.should == [1] + a = loop do break *[1,2]; end; a.should == [1,2] + a = loop do break *[*[1,2]]; end; a.should == [1,2] + end + end + + ruby_version_is "" ... "1.9" do + it "assigns to a splatted reference" do + *a = loop do break; end; a.should == [nil] + *a = loop do break nil; end; a.should == [nil] + *a = loop do break 1; end; a.should == [1] + *a = loop do break []; end; a.should == [[]] + *a = loop do break [1]; end; a.should == [[1]] + *a = loop do break [nil]; end; a.should == [[nil]] + *a = loop do break [[]]; end; a.should == [[[]]] + *a = loop do break [1,2]; end; a.should == [[1,2]] + *a = loop do break [*[]]; end; a.should == [[]] + *a = loop do break [*[1]]; end; a.should == [[1]] + *a = loop do break [*[1,2]]; end; a.should == [[1,2]] + end + end + + ruby_version_is "1.9" do + it "assigns to a splatted reference" do + *a = loop do break; end; a.should == [nil] + *a = loop do break nil; end; a.should == [nil] + *a = loop do break 1; end; a.should == [1] + *a = loop do break []; end; a.should == [] + *a = loop do break [1]; end; a.should == [1] + *a = loop do break [nil]; end; a.should == [nil] + *a = loop do break [[]]; end; a.should == [[]] + *a = loop do break [1,2]; end; a.should == [1,2] + *a = loop do break [*[]]; end; a.should == [] + *a = loop do break [*[1]]; end; a.should == [1] + *a = loop do break [*[1,2]]; end; a.should == [1,2] + end + end + + ruby_version_is "" ... "1.9" do + it "assigns splatted objects to a splatted reference" do + *a = loop do break *nil; end; a.should == [nil] + *a = loop do break *[]; end; a.should == [nil] + *a = loop do break *[1,2]; end; a.should == [[1,2]] + *a = loop do break *[*[]]; end; a.should == [nil] + *a = loop do break *[*[1,2]]; end; a.should == [[1,2]] + *a = loop do break *1; end; a.should == [1] + *a = loop do break *[1]; end; a.should == [1] + *a = loop do break *[nil]; end; a.should == [nil] + *a = loop do break *[[]]; end; a.should == [[]] + *a = loop do break *[*[1]]; end; a.should == [1] + end + end + + ruby_version_is "1.9" do + it "assigns splatted objects to a splatted reference" do + *a = loop do break *nil; end; a.should == [] + *a = loop do break *[]; end; a.should == [] + *a = loop do break *[1,2]; end; a.should == [1,2] + *a = loop do break *[*[]]; end; a.should == [] + *a = loop do break *[*[1,2]]; end; a.should == [1,2] + *a = loop do break *1; end; a.should == [1] + *a = loop do break *[1]; end; a.should == [1] + *a = loop do break *[nil]; end; a.should == [nil] + *a = loop do break *[[]]; end; a.should == [[]] + *a = loop do break *[*[1]]; end; a.should == [1] + end + end + + ruby_version_is "" ... "1.9" do + it "assigns splatted objects to a splatted reference from a splatted loop" do + *a = *loop do break *nil; end; a.should == [nil] + *a = *loop do break *[]; end; a.should == [nil] + *a = *loop do break *[[]]; end; a.should == [] + *a = *loop do break *[*[]]; end; a.should == [nil] + *a = *loop do break *1; end; a.should == [1] + *a = *loop do break *[1]; end; a.should == [1] + *a = *loop do break *[nil]; end; a.should == [nil] + *a = *loop do break *[1,2]; end; a.should == [1,2] + *a = *loop do break *[*[1]]; end; a.should == [1] + *a = *loop do break *[*[1,2]]; end; a.should == [1,2] + end + end + + ruby_version_is "1.9" do + it "assigns splatted objects to a splatted reference from a splatted loop" do + *a = *loop do break *nil; end; a.should == [] + *a = *loop do break *[]; end; a.should == [] + *a = *loop do break *[[]]; end; a.should == [[]] + *a = *loop do break *[*[]]; end; a.should == [] + *a = *loop do break *1; end; a.should == [1] + *a = *loop do break *[1]; end; a.should == [1] + *a = *loop do break *[nil]; end; a.should == [nil] + *a = *loop do break *[1,2]; end; a.should == [1,2] + *a = *loop do break *[*[1]]; end; a.should == [1] + *a = *loop do break *[*[1,2]]; end; a.should == [1,2] + end end it "assigns objects to multiple block variables" do @@ -178,40 +248,85 @@ describe "Breaking out of a loop with a value" do a,b,*c = loop do break [*[1,2]]; end; [a,b,c].should == [1,2,[]] end - it "assigns splatted objects to multiple block variables" do - a,b,*c = loop do break *nil; end; [a,b,c].should == [nil,nil,[]] - a,b,*c = loop do break *1; end; [a,b,c].should == [1,nil,[]] - a,b,*c = loop do break *[]; end; [a,b,c].should == [nil,nil,[]] - a,b,*c = loop do break *[1]; end; [a,b,c].should == [1,nil,[]] - a,b,*c = loop do break *[nil]; end; [a,b,c].should == [nil,nil,[]] - a,b,*c = loop do break *[[]]; end; [a,b,c].should == [nil,nil,[]] - a,b,*c = loop do break *[1,2]; end; [a,b,c].should == [1,2,[]] - a,b,*c = loop do break *[*[]]; end; [a,b,c].should == [nil,nil,[]] - a,b,*c = loop do break *[*[1]]; end; [a,b,c].should == [1,nil,[]] - a,b,*c = loop do break *[*[1,2]]; end; [a,b,c].should == [1,2,[]] + ruby_version_is "" ... "1.9" do + it "assigns splatted objects to multiple block variables" do + a,b,*c = loop do break *nil; end; [a,b,c].should == [nil,nil,[]] + a,b,*c = loop do break *1; end; [a,b,c].should == [1,nil,[]] + a,b,*c = loop do break *[]; end; [a,b,c].should == [nil,nil,[]] + a,b,*c = loop do break *[1]; end; [a,b,c].should == [1,nil,[]] + a,b,*c = loop do break *[nil]; end; [a,b,c].should == [nil,nil,[]] + a,b,*c = loop do break *[[]]; end; [a,b,c].should == [nil,nil,[]] + a,b,*c = loop do break *[1,2]; end; [a,b,c].should == [1,2,[]] + a,b,*c = loop do break *[*[]]; end; [a,b,c].should == [nil,nil,[]] + a,b,*c = loop do break *[*[1]]; end; [a,b,c].should == [1,nil,[]] + a,b,*c = loop do break *[*[1,2]]; end; [a,b,c].should == [1,2,[]] + end + end + + ruby_version_is "1.9" do + it "assigns splatted objects to multiple block variables" do + a,b,*c = loop do break *nil; end; [a,b,c].should == [nil,nil,[]] + a,b,*c = loop do break *1; end; [a,b,c].should == [1,nil,[]] + a,b,*c = loop do break *[]; end; [a,b,c].should == [nil,nil,[]] + a,b,*c = loop do break *[1]; end; [a,b,c].should == [1,nil,[]] + a,b,*c = loop do break *[nil]; end; [a,b,c].should == [nil,nil,[]] + a,b,*c = loop do break *[[]]; end; [a,b,c].should == [[],nil,[]] + a,b,*c = loop do break *[1,2]; end; [a,b,c].should == [1,2,[]] + a,b,*c = loop do break *[*[]]; end; [a,b,c].should == [nil,nil,[]] + a,b,*c = loop do break *[*[1]]; end; [a,b,c].should == [1,nil,[]] + a,b,*c = loop do break *[*[1,2]]; end; [a,b,c].should == [1,2,[]] + end end - it "stops any loop type at the correct spot" do - i = 0; loop do break i if i == 2; i+=1; end.should == 2 - i = 0; loop do break if i == 3; i+=1; end; i.should == 3 - i = 0; 0.upto(5) {|i| break i if i == 2 }.should == 2 - i = 0; 0.upto(5) {|i| break if i == 3 }; i.should == 3 - i = 0; while (i < 5) do break i if i == 2 ; i+=1; end.should == 2 - i = 0; while (i < 5) do break if i == 3 ; i+=1; end; i.should == 3 + ruby_version_is "" ... "1.9" do + it "stops any loop type at the correct spot" do + i = 0; loop do break i if i == 2; i+=1; end.should == 2 + i = 0; loop do break if i == 3; i+=1; end; i.should == 3 + i = 0; 0.upto(5) {|i| break i if i == 2 }.should == 2 + i = 0; 0.upto(5) {|i| break if i == 3 }; i.should == 3 + i = 0; while (i < 5) do break i if i == 2 ; i+=1; end.should == 2 + i = 0; while (i < 5) do break if i == 3 ; i+=1; end; i.should == 3 + end end - it "stops a yielded method at the correct spot" do - def break_test() - yield 1 - yield 2 - yield 3 + ruby_version_is "1.9" do + it "stops any loop type at the correct spot" do + i = 0; loop do break i if i == 2; i+=1; end.should == 2 + i = 0; loop do break if i == 3; i+=1; end; i.should == 3 + i = 0; 0.upto(5) {|i| break i if i == 2 }.should == 2 + i = 0; 0.upto(5) {|i| break if i == 3 }; i.should == 0 + i = 0; while (i < 5) do break i if i == 2 ; i+=1; end.should == 2 + i = 0; while (i < 5) do break if i == 3 ; i+=1; end; i.should == 3 end - break_test {|i| break i if i == 2 }.should == 2 - i = 0 - break_test {|i| break i if i == 1 } - i.should == 1 end + ruby_version_is "" ... "1.9" do + it "stops a yielded method at the correct spot" do + def break_test() + yield 1 + yield 2 + yield 3 + end + break_test {|i| break i if i == 2 }.should == 2 + i = 0 + break_test {|i| break i if i == 1 } + i.should == 1 + end + end + + ruby_version_is "1.9" do + it "stops a yielded method at the correct spot" do + def break_test() + yield 1 + yield 2 + yield 3 + end + break_test {|i| break i if i == 2 }.should == 2 + i = 0 + break_test {|i| break i if i == 1 } + i.should == 0 + end + end end -language_version __FILE__, "break" \ No newline at end of file +language_version __FILE__, "break" language/break_spec.rb @@ -1,22 +1,50 @@ require File.dirname(__FILE__) + '/../spec_helper' -describe "The catch keyword" do - it "only allows symbols and strings" do - lambda { catch(:foo) {} }.should_not raise_error - lambda { catch("foo") {} }.should_not raise_error - lambda { catch 1 }.should raise_error(ArgumentError) - lambda { catch Object.new }.should raise_error(TypeError) +describe "The catch keyword" do + ruby_version_is "" ... "1.9" do + it "only allows symbols and strings" do + lambda { catch(:foo) {} }.should_not raise_error + lambda { catch("foo") {} }.should_not raise_error + lambda { catch(1) {} }.should raise_error(ArgumentError) + lambda { catch(Object.new) {} }.should raise_error(TypeError) + end + end + + ruby_version_is "1.9" do + it "allows any object" do + lambda { catch(:foo) {} }.should_not raise_error + lambda { catch("foo") {} }.should_not raise_error + lambda { catch(1) {} }.should_not raise_error + lambda { catch(Object.new) {} }.should_not raise_error + end end it "returns the last value of the block if it nothing is thrown" do - catch(:exit) do + catch(:exit) do :noexit end.should == :noexit end - - it "matches strings as symbols" do - lambda { catch("exit") { throw :exit } }.should_not raise_error - lambda { catch("exit") { throw "exit" } }.should_not raise_error + + ruby_version_is "" ... "1.9" do + it "matches strings as symbols" do + lambda { catch("exit") { throw :exit } }.should_not raise_error + end + + it "matches strings with strings that contain the same characters" do + lambda { catch("exit") { throw "exit" } }.should_not raise_error + end + end + + ruby_version_is "1.9" do + it "does not match objects that are not exactly the same" do + lambda { catch("exit") { throw :exit } }.should raise_error(ArgumentError) + lambda { catch("exit") { throw "exit" } }.should raise_error(ArgumentError) + end + + it "catches objects that are exactly the same" do + lambda { catch(:exit) { throw :exit } }.should_not raise_error + lambda { exit = "exit"; catch(exit) { throw exit } }.should_not raise_error + end end it "requires a block" do @@ -52,5 +80,5 @@ describe "The catch keyword" do i << :a_exit i.should == [:a,:b,:b_exit,:a_exit] - end + end end language/catch_spec.rb @@ -138,6 +138,11 @@ describe "The defined? keyword" do ret.should == "constant" end + it "returns 'constant' when defined?(::File) is sent" do + ret = defined?(::File) + ret.should == "constant" + end + it "returns 'constant' when defined?(File::SEPARATOR) is sent" do ret = defined?(File::SEPARATOR) ret.should == "constant" language/defined_spec.rb @@ -164,22 +164,13 @@ describe "A constant on an eigenclass" do end.should raise_error(NameError) end - ruby_version_is "" ... "1.9" do - it "appears in the eigenclass constant list" do - constants = class << @object; constants; end - constants.should include("CONST") - end - end - - ruby_version_is "1.9" do - it "appears in the eigenclass constant list" do - constants = class << @object; constants; end - constants.should include(:CONST) - end + it "appears in the eigenclass constant list" do + klass = class << @object; self; end + klass.should have_constant(:CONST) end it "does not appear in the object's class constant list" do - @object.class.constants.should_not include(:CONST) + @object.class.should_not have_constant(:CONST) end it "is not preserved when the object is duped" do language/eigenclass_spec.rb @@ -49,16 +49,15 @@ describe "The for expression" do n.should == 3 end - # TODO: commented out due to a compiler error - #it "allows a class variable as an iterator name" do - # m = [1,2,3] - # n = 0 - # for @@var in m - # n += 1 - # end - # @@var.should == 3 - # n.should == 3 - #end + it "allows a class variable as an iterator name" do + m = [1,2,3] + n = 0 + for @@var in m + n += 1 + end + @@var.should == 3 + n.should == 3 + end it "splats multiple arguments together if there are fewer arguments than values" do class OFor @@ -153,4 +152,4 @@ describe "The for expression" do end end -language_version __FILE__, "for" \ No newline at end of file +language_version __FILE__, "for" language/for_spec.rb @@ -1,7 +1,6 @@ require File.dirname(__FILE__) + '/../spec_helper' describe "The loop expression" do - it "repeats the given block until a break is called" do outer_loop = 0 loop do @@ -10,7 +9,7 @@ describe "The loop expression" do end outer_loop.should == 10 end - + it "executes code in its own scope" do loop do inner_loop = 123 @@ -18,13 +17,13 @@ describe "The loop expression" do end lambda { inner_loop }.should raise_error(NameError) end - + it "returns the value passed to break if interrupted by break" do loop do break 123 end.should == 123 end - + it "returns nil if interrupted by break with no arguments" do loop do break @@ -41,14 +40,14 @@ describe "The loop expression" do end a.should == [1, 2, 4] end - + it "restarts the current iteration with redo" do a = [] loop do a << 1 redo if a.size < 2 a << 2 - break if a.size == 3 + break if a.size == 3 end a.should == [1, 1, 2] end @@ -64,5 +63,5 @@ describe "The loop expression" do break if a.size > 6 end a.should == [1, 1, 2, 1, 2, 3, 1, 2, 3] - end + end end language/loop_spec.rb @@ -27,8 +27,8 @@ describe "self in a metaclass body (class << obj)" do cls.is_a?(Class).should == true cls.should_not equal(Object) end - - deviates_on(:rubinius) do + + deviates_on(:rubinius) do it "is a MetaClass instance" do cls = class << mock('x'); self; end cls.is_a?(MetaClass).should == true @@ -132,8 +132,4 @@ describe "A constant on a metaclass" do CONST.should_not be_nil end end -end - - - - +end \ No newline at end of file language/metaclass_spec.rb @@ -642,29 +642,31 @@ describe "Literal Regexps" do 2.times { /#{o}/o } ScratchPad.recorded.should == [:to_s_callback] end + + ruby_version_is "" ... "1.9" do + it 'does not do thread synchronization for /o' do + ScratchPad.record [] + + to_s_callback2 = Proc.new do + ScratchPad << :to_s_callback2 + "class_with_to_s2" + end - it 'does not do thread synchronization for /o' do - ScratchPad.record [] - - to_s_callback2 = Proc.new do - ScratchPad << :to_s_callback2 - "class_with_to_s2" - end - - to_s_callback1 = Proc.new do - ScratchPad << :to_s_callback1 - t2 = Thread.new do - o2 = LanguageSpecs::ClassWith_to_s.new(to_s_callback2) - ScratchPad << LanguageSpecs.get_regexp_with_substitution(o2) + to_s_callback1 = Proc.new do + ScratchPad << :to_s_callback1 + t2 = Thread.new do + o2 = LanguageSpecs::ClassWith_to_s.new(to_s_callback2) + ScratchPad << LanguageSpecs.get_regexp_with_substitution(o2) + end + t2.join + "class_with_to_s1" end - t2.join - "class_with_to_s1" + + o1 = LanguageSpecs::ClassWith_to_s.new(to_s_callback1) + ScratchPad << LanguageSpecs.get_regexp_with_substitution(o1) + + ScratchPad.recorded.should == [:to_s_callback1, :to_s_callback2, /class_with_to_s2/, /class_with_to_s2/] end - - o1 = LanguageSpecs::ClassWith_to_s.new(to_s_callback1) - ScratchPad << LanguageSpecs.get_regexp_with_substitution(o1) - - ScratchPad.recorded.should == [:to_s_callback1, :to_s_callback2, /class_with_to_s2/, /class_with_to_s2/] end it 'supports modifier combinations' do @@ -678,7 +680,7 @@ describe "Literal Regexps" do # Encodings ############################################################################# - not_compliant_on :ruby19 do + not_compliant_on :ruby19, :macruby do it 'supports /e (EUC encoding)' do /./e.match("\303\251").to_a.should == ["\303\251"] end language/regexp_spec.rb @@ -22,22 +22,47 @@ describe "The return keyword" do r().should be_nil end - describe "in a Thread" do - it "raises a ThreadError if used to exit a thread" do - lambda { Thread.new { return }.join }.should raise_error(ThreadError) + ruby_version_is "" ... "1.9" do + it "raises a ThreadError if used to exit a thread" do + lambda { Thread.new { return }.join }.should raise_error(ThreadError) + end + end + + ruby_version_is "1.9" do + it "raises a LocalJumpError if used to exit a thread" do + lambda { Thread.new { return }.join }.should raise_error(LocalJumpError) + end end end describe "when passed a splat" do - it "returns nil when the ary is empty" do - def r; ary = []; return *ary; end - r.should be_nil + ruby_version_is "" ... "1.9" do + it "returns nil when the ary is empty" do + def r; ary = []; return *ary; end + r.should be_nil + end end - it "returns the first element when the array is size of 1" do - def r; ary = [1]; return *ary; end - r.should == 1 + ruby_version_is "1.9" do + it "returns [] when the ary is empty" do + def r; ary = []; return *ary; end + r.should == [] + end + end + + ruby_version_is "" ... "1.9" do + it "returns the first element when the array is size of 1" do + def r; ary = [1]; return *ary; end + r.should == 1 + end + end + + ruby_version_is "1.9" do + it "returns the array when the array is size of 1" do + def r; ary = [1]; return *ary; end + r.should == [1] + end end it "returns the whole array when size is greater than 1" do @@ -48,34 +73,22 @@ describe "The return keyword" do r.should == [1,2,3] end - it "returns a non-array when used as a splat" do - def r; value = 1; return *value; end - r.should == 1 - end - - it "calls 'to_a' on the splatted value first" do - def r - obj = Object.new - def obj.to_a - [] - end - - return *obj + ruby_version_is "" ... "1.9" do + it "returns a non-array when used as a splat" do + def r; value = 1; return *value; end + r.should == 1 end + end - r().should be_nil - - def r - obj = Object.new - def obj.to_a - [1] - end - - return *obj + ruby_version_is "1.9" do + it "returns an array when used as a splat" do + def r; value = 1; return *value; end + r.should == [1] end + end - r().should == 1 + it "calls 'to_a' on the splatted value first" do def r obj = Object.new def obj.to_a @@ -88,43 +101,22 @@ describe "The return keyword" do r().should == [1,2] end - it "calls 'to_ary' on the splatted value first" do - def r - obj = Object.new - def obj.to_ary - [] - end - - return *obj - end - - r().should be_nil - - def r - obj = Object.new - def obj.to_ary - [1] - end - - return *obj - end - - r().should == 1 + ruby_version_is "" ... "1.9" do + it "calls 'to_ary' on the splatted value first" do + def r + obj = Object.new + def obj.to_ary + [1,2] + end - def r - obj = Object.new - def obj.to_ary - [1,2] + return *obj end - return *obj + r().should == [1,2] end - - r().should == [1,2] end end - describe "within a begin" do it "executes ensure before returning from function" do def f(a) @@ -184,15 +176,16 @@ describe "The return keyword" do end end - describe "within a block" do before :each do ScratchPad.clear end - it "raises a LocalJumpError if there is no lexicaly enclosing method" do - def f; yield; end - lambda { f { return 5 } }.should raise_error(LocalJumpError) + ruby_version_is "" ... "1.9" do + it "raises a LocalJumpError if there is no lexicaly enclosing method" do + def f; yield; end + lambda { f { return 5 } }.should raise_error(LocalJumpError) + end end it "causes lambda to return nil if invoked without any arguments" do @@ -231,5 +224,4 @@ describe "The return keyword" do f.should be_true end end - end language/return_spec.rb @@ -9,7 +9,7 @@ describe "The throw keyword" do throw :done if i > 4 end i += 1 - end + end i.should == 5 end @@ -27,17 +27,34 @@ describe "The throw keyword" do msg.should == nil end - it "only allows symbols and strings as it's argument" do - lambda { throw 1 }.should raise_error(ArgumentError) - lambda { throw Object.new }.should raise_error(TypeError) + ruby_version_is "" ... "1.9" do + it "only allows symbols and strings as its argument" do + lambda { throw 1 }.should raise_error(ArgumentError) + lambda { throw Object.new }.should raise_error(TypeError) + end + end + + ruby_version_is "1.9" do + it "only any object as its argument" do + lambda { catch(1) { throw 1 } }.should_not raise_error + lambda { o = Object.new; catch(o) { throw o } }.should_not raise_error + end end - it "converts strings to a symbol" do - lambda { catch(:exit) { throw "exit" } }.should_not raise_error - a = "exit" - lambda { catch(:exit) { throw a } }.should_not raise_error + ruby_version_is "" ... "1.9" do + it "converts strings to a symbol" do + lambda { catch(:exit) { throw "exit" } }.should_not raise_error + a = "exit" + lambda { catch(:exit) { throw a } }.should_not raise_error + end end - + + ruby_version_is "1.9" do + it "does not convert strings to a symbol" do + lambda { catch(:exit) { throw "exit" } }.should raise_error(ArgumentError) + end + end + it "unwinds stack from within a method" do def throw_method(handler,val) throw handler,val @@ -52,19 +69,42 @@ describe "The throw keyword" do c = lambda { throw :foo, :msg } catch(:foo) { c.call }.should == :msg end - - it "raises a name error if outside of scope of a matching catch" do - lambda { throw :test,5 }.should raise_error(NameError) - lambda { catch(:different) { throw :test,5 } }.should raise_error(NameError) + + ruby_version_is "" ... "1.9" do + it "raises a NameError if outside of scope of a matching catch" do + lambda { throw :test,5 }.should raise_error(NameError) + lambda { catch(:different) { throw :test,5 } }.should raise_error(NameError) + end end - it "raises a ThreadError if used to exit a thread" do - lambda { - catch(:what) do - Thread.new do - throw :what - end.join - end - }.should raise_error(ThreadError) - end + ruby_version_is "1.9" do + it "raises an ArgumentError if outside of scope of a matching catch" do + lambda { throw :test,5 }.should raise_error(ArgumentError) + lambda { catch(:different) { throw :test,5 } }.should raise_error(ArgumentError) + end + end + + ruby_version_is "" ... "1.9" do + it "raises a ThreadError if used to exit a thread" do + lambda { + catch(:what) do + Thread.new do + throw :what + end.join + end + }.should raise_error(ThreadError) + end + end + + ruby_version_is "1.9" do + it "raises a ArgumentError if used to exit a thread" do + lambda { + catch(:what) do + Thread.new do + throw :what + end.join + end + }.should raise_error(ArgumentError) + end + end end language/throw_spec.rb 01c957aeac4ae0fcaf7b48063f8a8e4b6c35a97e Eloy Duran eloy.de.enige@gmail.com http://github.com/rubyspec/rubyspec/commit/554d336fb5911e571e10cada12402a91ab5f8ac0 554d336fb5911e571e10cada12402a91ab5f8ac0 2009-07-01T11:33:25-07:00 2009-06-30T13:47:53-07:00 Updated and added a few specs in ./language/ for 1.9. No idea why ./language/for_spec.rb was commented...? 1565c623655adb7790bb9fbe8526ddbb9daf17ed Eloy Duran eloy.de.enige@gmail.com