rubinius · Jul 29, 2015 · Jul 29, 2015
Showing with 22 additions and 23 deletions.

+22 −22 kernel/common/range.rb

+0 −1 spec/tags/ruby/core/range/bsearch_tags.txt
diff --git a/kernel/common/range.rb b/kernel/common/range.rb
@@ -51,47 +51,47 @@ def bsearch
 
     last_true = nil
 
-    if max < 0 and min < 0
-      value = min + (max - min) / 2
-    elsif min < -max
-      value = -((-1 - min - max) / 2 + 1)
-    else
-      value = (min + max) / 2
-    end
-
-    while min < max
-      x = yield value
+    seeker = Proc.new do |current|
+      x = yield current
 
-      return value if x == 0
+      return current if x == 0
 
       case x
       when Numeric
         if x > 0
-          min = value + 1
+          min = current + 1
         else
-          max = value
+          max = current
         end
       when true
-        last_true = value
-        max = value
+        last_true = current
+        max = current
       when false, nil
-        min = value + 1
+        min = current + 1
       else
         raise TypeError, "Range#bsearch block must return Numeric or boolean"
       end
+    end
 
+    while min < max
       if max < 0 and min < 0
-        value = min + (max - min) / 2
+        mid = min + (max - min) / 2
       elsif min < -max
-        value = -((-1 - min - max) / 2 + 1)
+        mid = -((-1 - min - max) / 2 + 1)
       else
-        value = (min + max) / 2
-      end
+        mid = (min + max) / 2
+      end      
+
+      seeker.call mid
+    end
+
+    if min == max
+      seeker.call min
     end
 
     if min < max
-      return @begin if value == start
-      return @begin.kind_of?(Float) ? value.to_f : value
+      return @begin if mid == start
+      return @begin.kind_of?(Float) ? mid.to_f : mid
     end
 
     if last_true

diff --git a/spec/tags/ruby/core/range/bsearch_tags.txt b/spec/tags/ruby/core/range/bsearch_tags.txt