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

* internal.c: struct cmp_opt_data added for refactoring out a data

Browse Source 
structure for CMP_OPTIMIZABLE

* array.c (struct ary_sort_data): use struct cmp_opt_data.

* enum.c (struct min_t, max_t, min_max_t): use struct cmp_opt_data.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54149 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
mame 2016-03-17 12:03:48 +00:00
parent 85473c481e
commit a22455199b
4 changed files with 37 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
Thu Mar 17 21:02:42 2016 Yusuke Endoh <mame@tsg.ne.jp>
* internal.c: struct cmp_opt_data added for refactoring out a data
structure for CMP_OPTIMIZABLE
* array.c (struct ary_sort_data): use struct cmp_opt_data.
* enum.c (struct min_t, max_t, min_max_t): use struct cmp_opt_data.
Thu Mar 17 20:55:21 2016 Tanaka Akira <akr@fsij.org> Thu Mar 17 20:55:21 2016 Tanaka Akira <akr@fsij.org>
* enum.c (ary_inject_op): Extracted from enum_inject. * enum.c (ary_inject_op): Extracted from enum_inject.

11
array.c
View File

@ -2364,8 +2364,7 @@ rb_ary_rotate_m(int argc, VALUE *argv, VALUE ary)
struct ary_sort_data { struct ary_sort_data {
VALUE ary; VALUE ary;
int opt_methods; struct cmp_opt_data cmp_opt;
int opt_inited;
}; };
static VALUE static VALUE
@ -2399,12 +2398,12 @@ sort_2(const void *ap, const void *bp, void *dummy)
VALUE a = *(const VALUE *)ap, b = *(const VALUE *)bp; VALUE a = *(const VALUE *)ap, b = *(const VALUE *)bp;
int n; int n;
if (FIXNUM_P(a) && FIXNUM_P(b) && CMP_OPTIMIZABLE(data, Fixnum)) { if (FIXNUM_P(a) && FIXNUM_P(b) && CMP_OPTIMIZABLE(data->cmp_opt, Fixnum)) {
if ((long)a > (long)b) return 1; if ((long)a > (long)b) return 1;
if ((long)a < (long)b) return -1; if ((long)a < (long)b) return -1;
return 0; return 0;
} }
if (STRING_P(a) && STRING_P(b) && CMP_OPTIMIZABLE(data, String)) { if (STRING_P(a) && STRING_P(b) && CMP_OPTIMIZABLE(data->cmp_opt, String)) {
return rb_str_cmp(a, b); return rb_str_cmp(a, b);
} }
@ -2448,8 +2447,8 @@ rb_ary_sort_bang(VALUE ary)
RBASIC_CLEAR_CLASS(tmp); RBASIC_CLEAR_CLASS(tmp);
data.ary = tmp; data.ary = tmp;
data.opt_methods = 0; data.cmp_opt.opt_methods = 0;
data.opt_inited = 0; data.cmp_opt.opt_inited = 0;
RARRAY_PTR_USE(tmp, ptr, { RARRAY_PTR_USE(tmp, ptr, {
ruby_qsort(ptr, len, sizeof(VALUE), ruby_qsort(ptr, len, sizeof(VALUE),
rb_block_given_p()?sort_1:sort_2, &data); rb_block_given_p()?sort_1:sort_2, &data);

31
enum.c
View File

@ -1495,8 +1495,7 @@ enum_none(VALUE obj)
struct min_t { struct min_t {
VALUE min; VALUE min;
int opt_methods; struct cmp_opt_data cmp_opt;
int opt_inited;
}; };
static VALUE static VALUE
@ -1510,7 +1509,7 @@ min_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, args))
memo->min = i; memo->min = i;
} }
else { else {
if (OPTIMIZED_CMP(i, memo->min, memo) < 0) { if (OPTIMIZED_CMP(i, memo->min, memo->cmp_opt) < 0) {
memo->min = i; memo->min = i;
} }
} }
@ -1575,8 +1574,8 @@ enum_min(int argc, VALUE *argv, VALUE obj)
return nmin_run(obj, num, 0, 0); return nmin_run(obj, num, 0, 0);
m->min = Qundef; m->min = Qundef;
m->opt_methods = 0; m->cmp_opt.opt_methods = 0;
m->opt_inited = 0; m->cmp_opt.opt_inited = 0;
if (rb_block_given_p()) { if (rb_block_given_p()) {
rb_block_call(obj, id_each, 0, 0, min_ii, memo); rb_block_call(obj, id_each, 0, 0, min_ii, memo);
} }
@ -1590,8 +1589,7 @@ enum_min(int argc, VALUE *argv, VALUE obj)
struct max_t { struct max_t {
VALUE max; VALUE max;
int opt_methods; struct cmp_opt_data cmp_opt;
int opt_inited;
}; };
static VALUE static VALUE
@ -1605,7 +1603,7 @@ max_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, args))
memo->max = i; memo->max = i;
} }
else { else {
if (OPTIMIZED_CMP(i, memo->max, memo) > 0) { if (OPTIMIZED_CMP(i, memo->max, memo->cmp_opt) > 0) {
memo->max = i; memo->max = i;
} }
} }
@ -1669,8 +1667,8 @@ enum_max(int argc, VALUE *argv, VALUE obj)
return nmin_run(obj, num, 0, 1); return nmin_run(obj, num, 0, 1);
m->max = Qundef; m->max = Qundef;
m->opt_methods = 0; m->cmp_opt.opt_methods = 0;
m->opt_inited = 0; m->cmp_opt.opt_inited = 0;
if (rb_block_given_p()) { if (rb_block_given_p()) {
rb_block_call(obj, id_each, 0, 0, max_ii, (VALUE)memo); rb_block_call(obj, id_each, 0, 0, max_ii, (VALUE)memo);
} }
@ -1686,8 +1684,7 @@ struct minmax_t {
VALUE min; VALUE min;
VALUE max; VALUE max;
VALUE last; VALUE last;
int opt_methods; struct cmp_opt_data cmp_opt;
int opt_inited;
}; };
static void static void
@ -1700,11 +1697,11 @@ minmax_i_update(VALUE i, VALUE j, struct minmax_t *memo)
memo->max = j; memo->max = j;
} }
else { else {
n = OPTIMIZED_CMP(i, memo->min, memo); n = OPTIMIZED_CMP(i, memo->min, memo->cmp_opt);
if (n < 0) { if (n < 0) {
memo->min = i; memo->min = i;
} }
n = OPTIMIZED_CMP(j, memo->max, memo); n = OPTIMIZED_CMP(j, memo->max, memo->cmp_opt);
if (n > 0) { if (n > 0) {
memo->max = j; memo->max = j;
} }
@ -1727,7 +1724,7 @@ minmax_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, _memo))
j = memo->last; j = memo->last;
memo->last = Qundef; memo->last = Qundef;
n = OPTIMIZED_CMP(j, i, memo); n = OPTIMIZED_CMP(j, i, memo->cmp_opt);
if (n == 0) if (n == 0)
i = j; i = j;
else if (n < 0) { else if (n < 0) {
@ -1817,8 +1814,8 @@ enum_minmax(VALUE obj)
m->min = Qundef; m->min = Qundef;
m->last = Qundef; m->last = Qundef;
m->opt_methods = 0; m->cmp_opt.opt_methods = 0;
m->opt_inited = 0; m->cmp_opt.opt_inited = 0;
if (rb_block_given_p()) { if (rb_block_given_p()) {
rb_block_call(obj, id_each, 0, 0, minmax_ii, memo); rb_block_call(obj, id_each, 0, 0, minmax_ii, memo);
if (m->last != Qundef) if (m->last != Qundef)

13
internal.h
View File

@ -685,13 +685,18 @@ enum {
cmp_optimizable_count cmp_optimizable_count
}; };
struct cmp_opt_data {
int opt_methods;
int opt_inited;
};
#define CMP_OPTIMIZABLE_BIT(type) (1U << TOKEN_PASTE(cmp_opt_,type)) #define CMP_OPTIMIZABLE_BIT(type) (1U << TOKEN_PASTE(cmp_opt_,type))
#define CMP_OPTIMIZABLE(data, type) \ #define CMP_OPTIMIZABLE(data, type) \
(((data)->opt_inited & CMP_OPTIMIZABLE_BIT(type)) ? \ (((data).opt_inited & CMP_OPTIMIZABLE_BIT(type)) ? \
((data)->opt_methods & CMP_OPTIMIZABLE_BIT(type)) : \ ((data).opt_methods & CMP_OPTIMIZABLE_BIT(type)) : \
(((data)->opt_inited |= CMP_OPTIMIZABLE_BIT(type)), \ (((data).opt_inited |= CMP_OPTIMIZABLE_BIT(type)), \
rb_method_basic_definition_p(TOKEN_PASTE(rb_c,type), id_cmp) && \ rb_method_basic_definition_p(TOKEN_PASTE(rb_c,type), id_cmp) && \
((data)->opt_methods |= CMP_OPTIMIZABLE_BIT(type)))) ((data).opt_methods |= CMP_OPTIMIZABLE_BIT(type))))
/* ment is in method.h */ /* ment is in method.h */