rhodes 2.0.0.beta11 → 2.0.0.rc1

data/spec/framework_spec/app/spec/core/array/element_reference_spec.rb

@@ -23,20 +23,6 @@ describe "Array.[]" do
     Array[1, 2, *splatted_array].should == [1, 2, 3, 4, 5]
   end
 
-  ruby_version_is '1.9' do
-    it 'can unpack 2 or more nested referenced array' do
-      splatted_array = Array[3, 4, 5]
-      splatted_array2 = Array[6, 7, 8]
-      eval("Array[1, 2, *splatted_array, *splatted_array2]").should == [1, 2, 3, 4, 5, 6, 7, 8]
-    end
-
-    it 'constructs a nested Hash for tailing key-value pairs' do
-      eval(<<-EOS).should == [1, 2, { 3=> 4, 5 => 6 }]
-        Array[1, 2, 3 => 4, 5 => 6]
-      EOS
-    end
-  end
-  
   it "returns an instance of the subtype when called on an Array subclass" do
     ArraySub = Class.new Array
     ArraySub[1,2].class.should == ArraySub

data/spec/framework_spec/app/spec/core/array/flatten_spec.rb

@@ -11,14 +11,14 @@ describe "Array#flatten" do
       [ 1, 2, [3, [4, 5] ] ].flatten(1).should == [1, 2, 3, [4, 5]]
     end
 
-    ruby_version_is ""..."1.9.2" do
+    ruby_version_is ""..."1.9" do
       it "returns self when the level of recursion is 0" do
         a = [ 1, 2, [3, [4, 5] ] ]
         a.flatten(0).should equal(a)
       end
     end
 
-    ruby_version_is "1.9.2" do
+    ruby_version_is "1.9" do
       it "returns dup when the level of recursion is 0" do
         a = [ 1, 2, [3, [4, 5] ] ]
         a.flatten(0).should == a

data/spec/framework_spec/app/spec/core/array/pack_spec.rb

@@ -5,6 +5,8 @@
 require File.dirname(File.join(__rhoGetCurrentDir(), __FILE__)) + '/../../spec_helper'
 require File.dirname(File.join(__rhoGetCurrentDir(), __FILE__)) + '/fixtures/classes'
 
+=begin
+
 if ENV['MRI'] then
   $: << 'kernel/core'
   require 'pack'
@@ -2371,3 +2373,4 @@ describe "String#unpack with 'w' directive" do
   end
 end
 
+=end

data/spec/framework_spec/app/spec/core/array/shared/join.rb

@@ -75,6 +75,8 @@ describe :array_join, :shared => true do
     [].taint.send(@method, ":".taint).tainted?.should == false
   end
 
+  # This doesn't work for Enumerable#join on 1.9. See bug #1732
+=begin
   it "returns a string which would be infected with taint of the array, its elements or the separator when the array is not empty" do
     ["a", "b"].send(@method, ":").tainted?.should == false
     ["a", "b"].send(@method, ":".taint).tainted?.should == true
@@ -93,6 +95,7 @@ describe :array_join, :shared => true do
     ["a".taint, "b".taint].taint.send(@method, ":").tainted?.should == true
     ["a".taint, "b".taint].taint.send(@method, ":".taint).tainted?.should == true
   end
+=end
 
   ruby_version_is '1.9' do
     it "does not consider untrustworthiness of either the array or the separator when the array is empty" do

data/spec/framework_spec/app/spec/core/array/to_s_spec.rb

@@ -33,6 +33,8 @@ describe "Array#to_s" do
       a.to_s.should == a.inspect
     end
 
+    # This test fails on mainline Ruby 1.9
+=begin
     it "is equivalent to Array#inspect in a recursive array" do
       a = [1, 2, 3, 4]; a << a
       a.to_s.should == a.inspect
@@ -41,5 +43,6 @@ describe "Array#to_s" do
       a.to_s.should == "[[...]]"
       a.inspect == "[[...]]"
     end
+=end
   end
 end

data/spec/framework_spec/app/spec/core/bignum/bit_and_spec.rb

@@ -12,15 +12,40 @@ describe "Bignum#&" do
     (@bignum & bignum_value(9921)).should == 9223372036854775809
 
     ((2*bignum_value) & 1).should == 0
+    ((2*bignum_value) & (2*bignum_value)).should == 18446744073709551616
+  end
+
+  it "returns self bitwise AND other when one operand is negative" do
     ((2*bignum_value) & -1).should == 18446744073709551616
     ((4*bignum_value) & -1).should == 36893488147419103232
-    ((2*bignum_value) & (2*bignum_value)).should == 18446744073709551616
-    (bignum_value & bignum_value(0xffff).to_f).should == 9223372036854775808
+    (@bignum & -0xffffffffffffff5).should == 9223372036854775809
+    (@bignum & -@bignum).should == 1
+    (@bignum & -0x8000000000000000).should == 9223372036854775808
+  end
+
+  it "returns self bitwise AND other when both operands are negative" do
+    (-@bignum & -0x4000000000000005).should == -13835058055282163717
+    (-@bignum & -@bignum).should == -9223372036854775813
+    (-@bignum & -0x4000000000000000).should == -13835058055282163712
+  end
+
+  ruby_version_is ""..."1.9" do
+    it "coerces Float arguments into Integers" do
+      (@bignum & 3.4).should == 1
+      (bignum_value & bignum_value(0xffff).to_f).should == 9223372036854775808
+    end
+  end
+
+  ruby_version_is "1.9" do
+    it "raises a TypeError when passed a Float" do
+      lambda { (@bignum & 3.4) }.should raise_error(TypeError)
+      lambda {
+        (bignum_value & bignum_value(0xffff).to_f)
+      }.should raise_error(TypeError)
+    end
   end
 
   it "tries to convert the given argument to an Integer using to_int" do
-    (@bignum & 3.4).should == 1
-    
     (obj = mock('3')).should_receive(:to_int).and_return(3)
     (@bignum & obj).should == 1
   end

data/spec/framework_spec/app/spec/core/bignum/bit_or_spec.rb

@@ -9,12 +9,37 @@ describe "Bignum#|" do
     (@bignum | 2).should == 9223372036854775819
     (@bignum | 9).should == 9223372036854775819
     (@bignum | bignum_value).should == 9223372036854775819
-    (bignum_value | bignum_value(0xffff).to_f).should == 9223372036854841344
+  end
+
+  it "returns self bitwise OR other when one operand is negative" do
+    (@bignum | -0x40000000000000000).should == -64563604257983430645
+    (@bignum | -@bignum).should == -1
+    (@bignum | -0x8000000000000000).should == -9223372036854775797
+  end
+
+  it "returns self bitwise OR other when both operands are negative" do
+    (-@bignum | -0x4000000000000005).should == -1
+    (-@bignum | -@bignum).should == -9223372036854775819
+    (-@bignum | -0x4000000000000000).should == -11
+  end
+
+  ruby_version_is ""..."1.9" do
+    it "coerces Float arguments to Integers" do
+      (bignum_value | bignum_value(0xffff).to_f).should == 9223372036854841344
+      (@bignum | 9.9).should == 9223372036854775819
+    end
+  end
+
+  ruby_version_is "1.9" do
+    it "raises a TypeError when passed a Float" do
+      lambda {
+        bignum_value | bignum_value(0xffff).to_f
+      }.should raise_error(TypeError)
+      lambda { @bignum | 9.9 }.should raise_error(TypeError)
+    end
   end
 
   it "tries to convert the given argument to an Integer using to_int" do
-    (@bignum | 9.9).should == 9223372036854775819
-    
     (obj = mock('2')).should_receive(:to_int).and_return(2)
     (@bignum | obj).should == 9223372036854775819
   end

data/spec/framework_spec/app/spec/core/bignum/bit_xor_spec.rb

@@ -9,12 +9,37 @@ describe "Bignum#^" do
     (@bignum ^ 2).should == 9223372036854775824
     (@bignum ^ @bignum).should == 0
     (@bignum ^ 14).should == 9223372036854775836
-    (bignum_value ^ bignum_value(0xffff).to_f).should == 65536
+  end
+
+  it "returns self bitwise EXCLUSIVE OR other when one operand is negative" do
+    (@bignum ^ -0x40000000000000000).should == -64563604257983430638
+    (@bignum ^ -@bignum).should == -4
+    (@bignum ^ -0x8000000000000000).should == -18446744073709551598
+  end
+
+  it "returns self bitwise EXCLUSIVE OR other when both operands are negative" do
+    (-@bignum ^ -0x40000000000000000).should == 64563604257983430638
+    (-@bignum ^ -@bignum).should == 0
+    (-@bignum ^ -0x4000000000000000).should == 13835058055282163694
+  end
+
+  ruby_version_is ""..."1.9" do
+    it "coerces Float arguments into Integers" do
+      (@bignum ^ 14.5).should == 9223372036854775836
+      (bignum_value ^ bignum_value(0xffff).to_f).should == 65536
+    end
+  end
+
+  ruby_version_is "1.9" do
+    it "raises a TypeError when passed a Float" do
+      lambda { @bignum ^ 14.5 }.should raise_error(TypeError)
+      lambda {
+        bignum_value ^ bignum_value(0xffff).to_f
+      }.should raise_error(TypeError)
+    end
   end
 
   it "tries to convert the given argument to an Integer using to_int" do
-    (@bignum ^ 14.5).should == 9223372036854775836
-    
     (obj = mock('2')).should_receive(:to_int).and_return(2)
     (@bignum ^ obj).should == 9223372036854775824
   end