Diff
Modified: MacRuby/branches/experimental/spec/frozen/language/block_spec.rb (1069 => 1070)
--- MacRuby/branches/experimental/spec/frozen/language/block_spec.rb 2009-03-22 23:34:17 UTC (rev 1069)
+++ MacRuby/branches/experimental/spec/frozen/language/block_spec.rb 2009-03-23 00:04:02 UTC (rev 1070)
@@ -16,24 +16,6 @@
end
end
-describe "Block parameters" do
- it "assign to local variable" do
- i = 0
- a = [1,2,3]
- a.each {|i| ;}
- i.should == 3
- end
-
- it "captures variables from the outer scope" do
- a = [1,2,3]
- sum = 0
- var = nil
- a.each {|var| sum += var}
- sum.should == 6
- var.should == 3
- end
-end
-
describe "A block whose arguments are splatted" do
it "captures the arguments passed to the block in an array" do
a = []
@@ -54,24 +36,4 @@
end
end
-describe "Block parameters (to be removed from MRI)" do
- it "assigns to a global variable" do
- $global_for_block_assignment = 0
- a = [1,2,3]
- a.each {|$global_for_block_assignment| ;}
- $global_for_block_assignment.should == 3
- end
-
- it "calls method=" do
- class T
- def n; return @n; end
- def n=(val); @n = val + 1; end
- def initialize; @n = 0; end
- end
- t = T.new
- t.n.should == 0
- a = [1,2,3]
- a.each {|t.n| }
- t.n.should == 4
- end
-end
+language_version __FILE__, "block"
\ No newline at end of file
Added: MacRuby/branches/experimental/spec/frozen/language/versions/block_1.8.rb (0 => 1070)
--- MacRuby/branches/experimental/spec/frozen/language/versions/block_1.8.rb (rev 0)
+++ MacRuby/branches/experimental/spec/frozen/language/versions/block_1.8.rb 2009-03-23 00:04:02 UTC (rev 1070)
@@ -0,0 +1,39 @@
+describe "Block parameters" do
+ it "assign to local variable" do
+ i = 0
+ a = [1,2,3]
+ a.each {|i| ;}
+ i.should == 3
+ end
+
+ it "captures variables from the outer scope" do
+ a = [1,2,3]
+ sum = 0
+ var = nil
+ a.each {|var| sum += var}
+ sum.should == 6
+ var.should == 3
+ end
+end
+
+describe "Block parameters (to be removed from MRI)" do
+ it "assigns to a global variable" do
+ $global_for_block_assignment = 0
+ a = [1,2,3]
+ a.each {|$global_for_block_assignment| ;}
+ $global_for_block_assignment.should == 3
+ end
+
+ it "calls method=" do
+ class T
+ def n; return @n; end
+ def n=(val); @n = val + 1; end
+ def initialize; @n = 0; end
+ end
+ t = T.new
+ t.n.should == 0
+ a = [1,2,3]
+ a.each {|t.n| }
+ t.n.should == 4
+ end
+end
\ No newline at end of file
Added: MacRuby/branches/experimental/spec/frozen/language/versions/block_1.9.rb (0 => 1070)
--- MacRuby/branches/experimental/spec/frozen/language/versions/block_1.9.rb (rev 0)
+++ MacRuby/branches/experimental/spec/frozen/language/versions/block_1.9.rb 2009-03-23 00:04:02 UTC (rev 1070)
@@ -0,0 +1,31 @@
+describe "Block parameters" do
+ it "does not override a shadowed variable from the outer scope" do
+ i = 0
+ a = [1,2,3]
+ a.each {|i| ;}
+ i.should == 0
+ end
+
+ it "captures variables from the outer scope" do
+ a = [1,2,3]
+ sum = 0
+ var = nil
+ a.each {|var| sum += var}
+ sum.should == 6
+ var.should == nil
+ end
+end
+
+describe "Block parameters (to be removed from MRI)" do
+ it "raises a SyntaxError when using a global variable" do
+ lambda do
+ eval "[].each {|$global_for_block_assignment| ;}"
+ end.should raise_error(SyntaxError)
+ end
+
+ it "raises a SyntaxError when making a method call" do
+ lambda do
+ eval "o = Object.new; [].each {|o.id| }"
+ end.should raise_error(SyntaxError)
+ end
+end
\ No newline at end of file