1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

array.c: trivial optimizations

Browse Source 
* array.c (rb_ary_bsearch): trivial optimizations, for Fixnum, and
  by keeping the last satisfied element.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49216 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2015-01-12 01:25:26 +00:00
parent 4d69e03b66
commit e19cf850df
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
array.c
View File

@ -2593,8 +2593,8 @@ static VALUE
rb_ary_bsearch(VALUE ary) rb_ary_bsearch(VALUE ary)
{ {
long low = 0, high = RARRAY_LEN(ary), mid; long low = 0, high = RARRAY_LEN(ary), mid;
int smaller = 0, satisfied = 0; int smaller = 0;
VALUE v, val; VALUE v, val, satisfied = Qnil;
RETURN_ENUMERATOR(ary, 0, 0); RETURN_ENUMERATOR(ary, 0, 0);
while (low < high) { while (low < high) {
@ -2602,11 +2602,11 @@ rb_ary_bsearch(VALUE ary)
val = rb_ary_entry(ary, mid); val = rb_ary_entry(ary, mid);
v = rb_yield(val); v = rb_yield(val);
if (FIXNUM_P(v)) { if (FIXNUM_P(v)) {
if (FIX2INT(v) == 0) return val; if (v == INT2FIX(0)) return val;
smaller = FIX2INT(v) < 0; smaller = (SIGNED_VALUE)v < 0; /* Fixnum preserves its sign-bit */
} }
else if (v == Qtrue) { else if (v == Qtrue) {
satisfied = 1; satisfied = val;
smaller = 1; smaller = 1;
} }
else if (v == Qfalse || v == Qnil) { else if (v == Qfalse || v == Qnil) {
@ -2614,7 +2614,7 @@ rb_ary_bsearch(VALUE ary)
} }
else if (rb_obj_is_kind_of(v, rb_cNumeric)) { else if (rb_obj_is_kind_of(v, rb_cNumeric)) {
const VALUE zero = INT2FIX(0); const VALUE zero = INT2FIX(0);
switch (rb_cmpint(rb_funcallv(v, id_cmp, 1, &zero), v, INT2FIX(0))) { switch (rb_cmpint(rb_funcallv(v, id_cmp, 1, &zero), v, zero)) {
case 0: return val; case 0: return val;
case 1: smaller = 1; break; case 1: smaller = 1; break;
case -1: smaller = 0; case -1: smaller = 0;
@ -2632,9 +2632,7 @@ rb_ary_bsearch(VALUE ary)
low = mid + 1; low = mid + 1;
} }
} }
if (low == RARRAY_LEN(ary)) return Qnil; return satisfied;
if (!satisfied) return Qnil;
return rb_ary_entry(ary, low);
} }