opal · May 30, 2015 · May 30, 2015
Showing with 44 additions and 15 deletions.

+42 −0 opal/corelib/array.rb

+1 −1 spec/corelib

+0 −13 spec/filters/bugs/array.rb

+1 −1 test/cruby
diff --git a/opal/corelib/array.rb b/opal/corelib/array.rb
@@ -472,6 +472,48 @@ def at(index)
     }
   end
 
+  def bsearch(&block)
+    return enum_for :bsearch unless block_given?
+
+    %x{
+      var min = 0,
+          max = self.length,
+          mid,
+          val,
+          ret,
+          smaller = false,
+          satisfied = nil;
+
+      while (min < max) {
+        mid = min + Math.floor((max - min) / 2);
+        val = self[mid];
+        ret = block(val);
+
+        if (ret === $breaker) {
+          return $breaker.$v;
+        }
+        else if (ret === true) {
+          satisfied = val;
+          smaller = true;
+        }
+        else if (ret === false || ret === nil) {
+          smaller = false;
+        }
+        else if (ret.$$is_number) {
+          if (ret === 0) { return val; }
+          smaller = (ret < 0);
+        }
+        else {
+          #{raise TypeError, "wrong argument type #{`ret`.class} (must be numeric, true, false or nil)"}
+        }
+
+        if (smaller) { max = mid; } else { min = mid + 1; }
+      }
+
+      return satisfied;
+    }
+  end
+
   def cycle(n = nil, &block)
     return if empty? || n == 0
 

diff --git a/spec/corelib b/spec/corelib
diff --git a/spec/filters/bugs/array.rb b/spec/filters/bugs/array.rb
@@ -152,19 +152,6 @@
   fails "Array#values_at properly handles recursive arrays"
   fails "Array#hash returns the same hash for equal recursive arrays through hashes"
 
-  fails "Array#bsearch returns an Enumerator when not passed a block"
-  fails "Array#bsearch raises a TypeError if the block returns an Object"
-  fails "Array#bsearch raises a TypeError if the block returns a String"
-  fails "Array#bsearch with a block returning true or false returns nil if the block returns false for every element"
-  fails "Array#bsearch with a block returning true or false returns nil if the block returns nil for every element"
-  fails "Array#bsearch with a block returning true or false returns element at zero if the block returns true for every element"
-  fails "Array#bsearch with a block returning true or false returns the element at the smallest index for which block returns true"
-  fails "Array#bsearch with a block returning negative, zero, positive numbers returns nil if the block returns less than zero for every element"
-  fails "Array#bsearch with a block returning negative, zero, positive numbers returns nil if the block returns greater than zero for every element"
-  fails "Array#bsearch with a block returning negative, zero, positive numbers returns nil if the block never returns zero"
-  fails "Array#bsearch with a block returning negative, zero, positive numbers accepts (+/-)Float::INFINITY from the block"
-  fails "Array#bsearch with a block returning negative, zero, positive numbers returns an element at an index for which block returns 0.0"
-  fails "Array#bsearch with a block returning negative, zero, positive numbers returns an element at an index for which block returns 0"
   fails "Array#first raises a RangeError when count is a Bignum"
   fails "Array#hash calls to_int on result of calling hash on each element"
   fails "Array#to_h converts empty array to empty hash"

diff --git a/test/cruby b/test/cruby
+87 −0		ChangeLog
+14 −0		ext/-test-/file/extconf.rb
+52 −38		ext/-test-/file/fs.c
+3 −3		ext/-test-/printf/printf.c
+0 −60		ext/bigdecimal/README
+0 −7		ext/bigdecimal/bigdecimal.c
+1 −1		ext/bigdecimal/bigdecimal.gemspec
+0 −7		ext/bigdecimal/bigdecimal.h
+1 −0		ext/socket/ancdata.c
+6 −2		ext/socket/ipsocket.c
+1 −0		ext/socket/raddrinfo.c
+7 −1		hash.c
+1 −0		internal.h
+7 −1		lib/net/imap.rb
+19 −12		marshal.c
+6 −2		numeric.c
+16 −2		range.c
+3 −2		rational.c
+3 −0		string.c
+13 −0		test/net/imap/test_imap_response_parser.rb
+8 −0		test/ruby/test_float.rb
+11 −0		test/ruby/test_marshal.rb
+8 −0		test/ruby/test_range.rb
+20 −0		test/ruby/test_settracefunc.rb
+19 −0		test/ruby/test_symbol.rb
+11 −0		test/socket/test_addrinfo.rb
+3 −3		version.h
+27 −29		vm.c