Float << and >> should be more compatible to Fixnum

2 files changed, 44 insertions, 4 deletions

diff --git a/mrblib/numeric.rb b/mrblib/numeric.rb
index 206185e78..6e4c5027f 100644
--- a/mrblib/numeric.rb
+++ b/mrblib/numeric.rb
@@ -165,12 +165,30 @@ class Float
   # floats should be compatible to integers.
   def >> other
     n = self.to_i
-    other.to_i.times { n /= 2 }
-    n
+    other = other.to_i
+    if other < 0
+      n << -other
+    else
+      other.times { n /= 2 }
+      if n.abs < 1
+        if n >= 0
+          0
+        else
+          -1
+        end
+      else
+        n.to_i
+      end
+    end
   end
   def << other
     n = self.to_i
-    other.to_i.times { n *= 2 }
-    n.to_i
+    other = other.to_i
+    if other < 0
+      n >> -other
+    else
+      other.times { n *= 2 }
+      n
+    end
   end
 end
diff --git a/test/t/float.rb b/test/t/float.rb
index d45709173..0aab0b1f2 100644
--- a/test/t/float.rb
+++ b/test/t/float.rb
@@ -178,3 +178,25 @@ assert('Float#nan?') do
   assert_false (1.0/0.0).nan?
   assert_false (-1.0/0.0).nan?
 end
+
+assert('Float#<<') do
+  # Left Shift by one
+  assert_equal 46, 23.0 << 1
+
+  # Left Shift by a negative is Right Shift
+  assert_equal 23, 46.0 << -1
+end
+
+assert('Float#>>') do
+  # Right Shift by one
+  assert_equal 23, 46.0 >> 1
+
+  # Right Shift by a negative is Left Shift
+  assert_equal 46, 23.0 >> -1
+
+  # Don't raise on large Right Shift
+  assert_equal 0, 23.0 >> 128
+
+  # Don't raise on large Right Shift
+  assert_equal -1, -23.0 >> 128
+end