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

* enum.c (enum_minmax): use struct for memo.

Browse Source 
(enum_minmax_by): ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@25118 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2009-09-27 02:28:57 +00:00
parent 0ff9cf3625
commit 50bbca9d5c
2 changed files with 97 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Sun Sep 27 11:28:15 2009 Tanaka Akira <akr@fsij.org>
* enum.c (enum_minmax): use struct for memo.
(enum_minmax_by): ditto.
Sun Sep 27 10:21:16 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> Sun Sep 27 10:21:16 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in (warnflags): check all flags if each are available. * configure.in (warnflags): check all flags if each are available.

165
enum.c
View File

@ -1134,41 +1134,49 @@ enum_max(VALUE obj)
return result[0]; return result[0];
} }
struct minmax_t {
VALUE min;
VALUE max;
VALUE ary;
VALUE last;
};
static void static void
minmax_i_update(VALUE i, VALUE j, VALUE *memo) minmax_i_update(VALUE i, VALUE j, struct minmax_t *memo)
{ {
int n; int n;
if (memo[0] == Qundef) { if (memo->min == Qundef) {
memo[0] = i; memo->min = i;
memo[1] = j; memo->max = j;
} }
else { else {
n = rb_cmpint(rb_funcall(i, id_cmp, 1, memo[0]), i, memo[0]); n = rb_cmpint(rb_funcall(i, id_cmp, 1, memo->min), i, memo->min);
if (n < 0) { if (n < 0) {
memo[0] = i; memo->min = i;
} }
n = rb_cmpint(rb_funcall(j, id_cmp, 1, memo[1]), j, memo[1]); n = rb_cmpint(rb_funcall(j, id_cmp, 1, memo->max), j, memo->max);
if (n > 0) { if (n > 0) {
memo[1] = j; memo->max = j;
} }
} }
} }
static VALUE static VALUE
minmax_i(VALUE i, VALUE *memo, int argc, VALUE *argv) minmax_i(VALUE i, VALUE _memo, int argc, VALUE *argv)
{ {
struct minmax_t *memo = (struct minmax_t *)_memo;
int n; int n;
VALUE j; VALUE j;
ENUM_WANT_SVALUE(); ENUM_WANT_SVALUE();
if (memo[3] == Qundef) { if (memo->last == Qundef) {
memo[3] = i; memo->last = i;
return Qnil; return Qnil;
} }
j = memo[3]; j = memo->last;
memo[3] = Qundef; memo->last = Qundef;
n = rb_cmpint(rb_funcall(j, id_cmp, 1, i), j, i); n = rb_cmpint(rb_funcall(j, id_cmp, 1, i), j, i);
if (n == 0) if (n == 0)
@ -1186,48 +1194,49 @@ minmax_i(VALUE i, VALUE *memo, int argc, VALUE *argv)
} }
static void static void
minmax_ii_update(VALUE i, VALUE j, VALUE *memo) minmax_ii_update(VALUE i, VALUE j, struct minmax_t *memo)
{ {
int n; int n;
if (memo[0] == Qundef) { if (memo->min == Qundef) {
memo[0] = i; memo->min = i;
memo[1] = j; memo->max = j;
} }
else { else {
VALUE ary = memo[2]; VALUE ary = memo->ary;
rb_ary_store(ary, 0, i); rb_ary_store(ary, 0, i);
rb_ary_store(ary, 1, memo[0]); rb_ary_store(ary, 1, memo->min);
n = rb_cmpint(rb_yield(ary), i, memo[0]); n = rb_cmpint(rb_yield(ary), i, memo->min);
if (n < 0) { if (n < 0) {
memo[0] = i; memo->min = i;
} }
rb_ary_store(ary, 0, j); rb_ary_store(ary, 0, j);
rb_ary_store(ary, 1, memo[1]); rb_ary_store(ary, 1, memo->max);
n = rb_cmpint(rb_yield(ary), j, memo[1]); n = rb_cmpint(rb_yield(ary), j, memo->max);
if (n > 0) { if (n > 0) {
memo[1] = j; memo->max = j;
} }
} }
} }
static VALUE static VALUE
minmax_ii(VALUE i, VALUE *memo, int argc, VALUE *argv) minmax_ii(VALUE i, VALUE _memo, int argc, VALUE *argv)
{ {
struct minmax_t *memo = (struct minmax_t *)_memo;
int n; int n;
VALUE ary, j; VALUE ary, j;
ENUM_WANT_SVALUE(); ENUM_WANT_SVALUE();
if (memo[3] == Qundef) { if (memo->last == Qundef) {
memo[3] = i; memo->last = i;
return Qnil; return Qnil;
} }
j = memo[3]; j = memo->last;
memo[3] = Qundef; memo->last = Qundef;
ary = memo[2]; ary = memo->ary;
rb_ary_store(ary, 0, j); rb_ary_store(ary, 0, j);
rb_ary_store(ary, 1, i); rb_ary_store(ary, 1, i);
n = rb_cmpint(rb_yield(ary), j, i); n = rb_cmpint(rb_yield(ary), j, i);
@ -1263,25 +1272,25 @@ minmax_ii(VALUE i, VALUE *memo, int argc, VALUE *argv)
static VALUE static VALUE
enum_minmax(VALUE obj) enum_minmax(VALUE obj)
{ {
VALUE result[4]; struct minmax_t memo;
VALUE ary = rb_ary_new3(2, Qnil, Qnil); VALUE ary = rb_ary_new3(2, Qnil, Qnil);
result[0] = Qundef; memo.min = Qundef;
result[3] = Qundef; memo.last = Qundef;
if (rb_block_given_p()) { if (rb_block_given_p()) {
result[2] = ary; memo.ary = ary;
rb_block_call(obj, id_each, 0, 0, minmax_ii, (VALUE)result); rb_block_call(obj, id_each, 0, 0, minmax_ii, (VALUE)&memo);
if (result[3] != Qundef) if (memo.last != Qundef)
minmax_ii_update(result[3], result[3], result); minmax_ii_update(memo.last, memo.last, &memo);
} }
else { else {
rb_block_call(obj, id_each, 0, 0, minmax_i, (VALUE)result); rb_block_call(obj, id_each, 0, 0, minmax_i, (VALUE)&memo);
if (result[3] != Qundef) if (memo.last != Qundef)
minmax_i_update(result[3], result[3], result); minmax_i_update(memo.last, memo.last, &memo);
} }
if (result[0] != Qundef) { if (memo.min != Qundef) {
rb_ary_store(ary, 0, result[0]); rb_ary_store(ary, 0, memo.min);
rb_ary_store(ary, 1, result[1]); rb_ary_store(ary, 1, memo.max);
} }
return ary; return ary;
} }
@ -1372,30 +1381,40 @@ enum_max_by(VALUE obj)
return memo[1]; return memo[1];
} }
struct minmax_by_t {
VALUE min_bv;
VALUE max_bv;
VALUE min;
VALUE max;
VALUE last_bv;
VALUE last;
};
static void static void
minmax_by_i_update(VALUE v1, VALUE v2, VALUE i1, VALUE i2, VALUE *memo) minmax_by_i_update(VALUE v1, VALUE v2, VALUE i1, VALUE i2, struct minmax_by_t *memo)
{ {
if (memo[0] == Qundef) { if (memo->min_bv == Qundef) {
memo[0] = v1; memo->min_bv = v1;
memo[1] = v2; memo->max_bv = v2;
memo[2] = i1; memo->min = i1;
memo[3] = i2; memo->max = i2;
} }
else { else {
if (rb_cmpint(rb_funcall(v1, id_cmp, 1, memo[0]), v1, memo[0]) < 0) { if (rb_cmpint(rb_funcall(v1, id_cmp, 1, memo->min_bv), v1, memo->min_bv) < 0) {
memo[0] = v1; memo->min_bv = v1;
memo[2] = i1; memo->min = i1;
} }
if (rb_cmpint(rb_funcall(v2, id_cmp, 1, memo[1]), v2, memo[1]) > 0) { if (rb_cmpint(rb_funcall(v2, id_cmp, 1, memo->max_bv), v2, memo->max_bv) > 0) {
memo[1] = v2; memo->max_bv = v2;
memo[3] = i2; memo->max = i2;
} }
} }
} }
static VALUE static VALUE
minmax_by_i(VALUE i, VALUE *memo, int argc, VALUE *argv) minmax_by_i(VALUE i, VALUE _memo, int argc, VALUE *argv)
{ {
struct minmax_by_t *memo = (struct minmax_by_t *)_memo;
VALUE vi, vj, j; VALUE vi, vj, j;
int n; int n;
@ -1403,14 +1422,14 @@ minmax_by_i(VALUE i, VALUE *memo, int argc, VALUE *argv)
vi = rb_yield(i); vi = rb_yield(i);
if (memo[4] == Qundef) { if (memo->last_bv == Qundef) {
memo[4] = vi; memo->last_bv = vi;
memo[5] = i; memo->last = i;
return Qnil; return Qnil;
} }
vj = memo[4]; vj = memo->last_bv;
j = memo[5]; j = memo->last;
memo[4] = Qundef; memo->last_bv = Qundef;
n = rb_cmpint(rb_funcall(vj, id_cmp, 1, vi), vj, vi); n = rb_cmpint(rb_funcall(vj, id_cmp, 1, vi), vj, vi);
if (n == 0) { if (n == 0) {
@ -1447,20 +1466,20 @@ minmax_by_i(VALUE i, VALUE *memo, int argc, VALUE *argv)
static VALUE static VALUE
enum_minmax_by(VALUE obj) enum_minmax_by(VALUE obj)
{ {
VALUE memo[6]; struct minmax_by_t memo;
RETURN_ENUMERATOR(obj, 0, 0); RETURN_ENUMERATOR(obj, 0, 0);
memo[0] = Qundef; memo.min_bv = Qundef;
memo[1] = Qundef; memo.max_bv = Qundef;
memo[2] = Qnil; memo.min = Qnil;
memo[3] = Qnil; memo.max = Qnil;
memo[4] = Qundef; memo.last_bv = Qundef;
memo[5] = Qundef; memo.last = Qundef;
rb_block_call(obj, id_each, 0, 0, minmax_by_i, (VALUE)memo); rb_block_call(obj, id_each, 0, 0, minmax_by_i, (VALUE)&memo);
if (memo[4] != Qundef) if (memo.last_bv != Qundef)
minmax_by_i_update(memo[4], memo[4], memo[5], memo[5], memo); minmax_by_i_update(memo.last_bv, memo.last_bv, memo.last, memo.last, &memo);
return rb_assoc_new(memo[2], memo[3]); return rb_assoc_new(memo.min, memo.max);
} }
static VALUE static VALUE