From 5b21e94bebed90180d8ff63dad03b8b948361089 Mon Sep 17 00:00:00 2001 From: Takashi Kokubun Date: Thu, 21 Jul 2022 09:23:58 -0700 Subject: Expand tabs [ci skip] [Misc #18891] --- range.c | 562 ++++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 281 insertions(+), 281 deletions(-) (limited to 'range.c') diff --git a/range.c b/range.c index e45e405f5a..39786ed97c 100644 --- a/range.c +++ b/range.c @@ -47,11 +47,11 @@ static void range_init(VALUE range, VALUE beg, VALUE end, VALUE exclude_end) { if ((!FIXNUM_P(beg) || !FIXNUM_P(end)) && !NIL_P(beg) && !NIL_P(end)) { - VALUE v; + VALUE v; - v = rb_funcall(beg, id_cmp, 1, end); - if (NIL_P(v)) - rb_raise(rb_eArgError, "bad value for range"); + v = rb_funcall(beg, id_cmp, 1, end); + if (NIL_P(v)) + rb_raise(rb_eArgError, "bad value for range"); } RANGE_SET_EXCL(range, exclude_end); @@ -78,7 +78,7 @@ range_modify(VALUE range) rb_check_frozen(range); /* Ranges are immutable, so that they should be initialized only once. */ if (RANGE_EXCL(range) != Qnil) { - rb_name_err_raise("`initialize' called twice", range, ID2SYM(idInitialize)); + rb_name_err_raise("`initialize' called twice", range, ID2SYM(idInitialize)); } } @@ -140,9 +140,9 @@ recursive_equal(VALUE range, VALUE obj, int recur) { if (recur) return Qtrue; /* Subtle! */ if (!rb_equal(RANGE_BEG(range), RANGE_BEG(obj))) - return Qfalse; + return Qfalse; if (!rb_equal(RANGE_END(range), RANGE_END(obj))) - return Qfalse; + return Qfalse; return RBOOL(EXCL(range) == EXCL(obj)); } @@ -183,9 +183,9 @@ static VALUE range_eq(VALUE range, VALUE obj) { if (range == obj) - return Qtrue; + return Qtrue; if (!rb_obj_is_kind_of(obj, rb_cRange)) - return Qfalse; + return Qfalse; return rb_exec_recursive_paired(recursive_equal, range, obj, obj); } @@ -201,7 +201,7 @@ r_less(VALUE a, VALUE b) VALUE r = rb_funcall(a, id_cmp, 1, b); if (NIL_P(r)) - return INT_MAX; + return INT_MAX; return rb_cmpint(r, a, b); } @@ -210,9 +210,9 @@ recursive_eql(VALUE range, VALUE obj, int recur) { if (recur) return Qtrue; /* Subtle! */ if (!rb_eql(RANGE_BEG(range), RANGE_BEG(obj))) - return Qfalse; + return Qfalse; if (!rb_eql(RANGE_END(range), RANGE_END(obj))) - return Qfalse; + return Qfalse; return RBOOL(EXCL(range) == EXCL(obj)); } @@ -251,9 +251,9 @@ static VALUE range_eql(VALUE range, VALUE obj) { if (range == obj) - return Qtrue; + return Qtrue; if (!rb_obj_is_kind_of(obj, rb_cRange)) - return Qfalse; + return Qfalse; return rb_exec_recursive_paired(recursive_eql, range, obj, obj); } @@ -294,17 +294,17 @@ range_each_func(VALUE range, int (*func)(VALUE, VALUE), VALUE arg) VALUE v = b; if (EXCL(range)) { - while (r_less(v, e) < 0) { - if ((*func)(v, arg)) break; - v = rb_funcallv(v, id_succ, 0, 0); - } + while (r_less(v, e) < 0) { + if ((*func)(v, arg)) break; + v = rb_funcallv(v, id_succ, 0, 0); + } } else { - while ((c = r_less(v, e)) <= 0) { - if ((*func)(v, arg)) break; - if (!c) break; - v = rb_funcallv(v, id_succ, 0, 0); - } + while ((c = r_less(v, e)) <= 0) { + if ((*func)(v, arg)) break; + if (!c) break; + v = rb_funcallv(v, id_succ, 0, 0); + } } } @@ -314,10 +314,10 @@ step_i_iter(VALUE arg) VALUE *iter = (VALUE *)arg; if (FIXNUM_P(iter[0])) { - iter[0] -= INT2FIX(1) & ~FIXNUM_FLAG; + iter[0] -= INT2FIX(1) & ~FIXNUM_FLAG; } else { - iter[0] = rb_funcall(iter[0], '-', 1, INT2FIX(1)); + iter[0] = rb_funcall(iter[0], '-', 1, INT2FIX(1)); } if (iter[0] != INT2FIX(0)) return false; iter[0] = iter[1]; @@ -328,7 +328,7 @@ static int sym_step_i(VALUE i, VALUE arg) { if (step_i_iter(arg)) { - rb_yield(rb_str_intern(i)); + rb_yield(rb_str_intern(i)); } return 0; } @@ -337,7 +337,7 @@ static int step_i(VALUE i, VALUE arg) { if (step_i_iter(arg)) { - rb_yield(i); + rb_yield(i); } return 0; } @@ -356,7 +356,7 @@ linear_object_p(VALUE obj) switch (BUILTIN_TYPE(obj)) { case T_FLOAT: case T_BIGNUM: - return TRUE; + return TRUE; default: break; } @@ -371,14 +371,14 @@ check_step_domain(VALUE step) VALUE zero = INT2FIX(0); int cmp; if (!rb_obj_is_kind_of(step, rb_cNumeric)) { - step = rb_to_int(step); + step = rb_to_int(step); } cmp = rb_cmpint(rb_funcallv(step, idCmp, 1, &zero), step, zero); if (cmp < 0) { - rb_raise(rb_eArgError, "step can't be negative"); + rb_raise(rb_eArgError, "step can't be negative"); } else if (cmp == 0) { - rb_raise(rb_eArgError, "step can't be 0"); + rb_raise(rb_eArgError, "step can't be 0"); } return step; } @@ -389,11 +389,11 @@ range_step_size(VALUE range, VALUE args, VALUE eobj) VALUE b = RANGE_BEG(range), e = RANGE_END(range); VALUE step = INT2FIX(1); if (args) { - step = check_step_domain(RARRAY_AREF(args, 0)); + step = check_step_domain(RARRAY_AREF(args, 0)); } if (rb_obj_is_kind_of(b, rb_cNumeric) && rb_obj_is_kind_of(e, rb_cNumeric)) { - return ruby_num_interval_step_size(b, e, step, EXCL(range)); + return ruby_num_interval_step_size(b, e, step, EXCL(range)); } return Qnil; } @@ -466,74 +466,74 @@ range_step(int argc, VALUE *argv, VALUE range) VALUE iter[2] = {INT2FIX(1), step}; if (FIXNUM_P(b) && NIL_P(e) && FIXNUM_P(step)) { - long i = FIX2LONG(b), unit = FIX2LONG(step); - do { - rb_yield(LONG2FIX(i)); - i += unit; /* FIXABLE+FIXABLE never overflow */ - } while (FIXABLE(i)); - b = LONG2NUM(i); + long i = FIX2LONG(b), unit = FIX2LONG(step); + do { + rb_yield(LONG2FIX(i)); + i += unit; /* FIXABLE+FIXABLE never overflow */ + } while (FIXABLE(i)); + b = LONG2NUM(i); - for (;; b = rb_big_plus(b, step)) - rb_yield(b); + for (;; b = rb_big_plus(b, step)) + rb_yield(b); } else if (FIXNUM_P(b) && FIXNUM_P(e) && FIXNUM_P(step)) { /* fixnums are special */ - long end = FIX2LONG(e); - long i, unit = FIX2LONG(step); - - if (!EXCL(range)) - end += 1; - i = FIX2LONG(b); - while (i < end) { - rb_yield(LONG2NUM(i)); - if (i + unit < i) break; - i += unit; - } + long end = FIX2LONG(e); + long i, unit = FIX2LONG(step); + + if (!EXCL(range)) + end += 1; + i = FIX2LONG(b); + while (i < end) { + rb_yield(LONG2NUM(i)); + if (i + unit < i) break; + i += unit; + } } else if (SYMBOL_P(b) && (NIL_P(e) || SYMBOL_P(e))) { /* symbols are special */ - b = rb_sym2str(b); - if (NIL_P(e)) { - rb_str_upto_endless_each(b, sym_step_i, (VALUE)iter); - } - else { - rb_str_upto_each(b, rb_sym2str(e), EXCL(range), sym_step_i, (VALUE)iter); - } + b = rb_sym2str(b); + if (NIL_P(e)) { + rb_str_upto_endless_each(b, sym_step_i, (VALUE)iter); + } + else { + rb_str_upto_each(b, rb_sym2str(e), EXCL(range), sym_step_i, (VALUE)iter); + } } else if (ruby_float_step(b, e, step, EXCL(range), TRUE)) { - /* done */ + /* done */ } else if (rb_obj_is_kind_of(b, rb_cNumeric) || - !NIL_P(rb_check_to_integer(b, "to_int")) || - !NIL_P(rb_check_to_integer(e, "to_int"))) { - ID op = EXCL(range) ? '<' : idLE; - VALUE v = b; - int i = 0; - - while (NIL_P(e) || RTEST(rb_funcall(v, op, 1, e))) { - rb_yield(v); - i++; - v = rb_funcall(b, '+', 1, rb_funcall(INT2NUM(i), '*', 1, step)); - } + !NIL_P(rb_check_to_integer(b, "to_int")) || + !NIL_P(rb_check_to_integer(e, "to_int"))) { + ID op = EXCL(range) ? '<' : idLE; + VALUE v = b; + int i = 0; + + while (NIL_P(e) || RTEST(rb_funcall(v, op, 1, e))) { + rb_yield(v); + i++; + v = rb_funcall(b, '+', 1, rb_funcall(INT2NUM(i), '*', 1, step)); + } } else { - tmp = rb_check_string_type(b); - - if (!NIL_P(tmp)) { - b = tmp; - if (NIL_P(e)) { - rb_str_upto_endless_each(b, step_i, (VALUE)iter); - } - else { - rb_str_upto_each(b, e, EXCL(range), step_i, (VALUE)iter); - } - } - else { - if (!discrete_object_p(b)) { - rb_raise(rb_eTypeError, "can't iterate from %s", - rb_obj_classname(b)); - } - range_each_func(range, step_i, (VALUE)iter); - } + tmp = rb_check_string_type(b); + + if (!NIL_P(tmp)) { + b = tmp; + if (NIL_P(e)) { + rb_str_upto_endless_each(b, step_i, (VALUE)iter); + } + else { + rb_str_upto_each(b, e, EXCL(range), step_i, (VALUE)iter); + } + } + else { + if (!discrete_object_p(b)) { + rb_raise(rb_eTypeError, "can't iterate from %s", + rb_obj_classname(b)); + } + range_each_func(range, step_i, (VALUE)iter); + } } return range; } @@ -582,12 +582,12 @@ int64_as_double_to_num(int64_t i) { union int64_double convert; if (i < 0) { - convert.i = -i; - return DBL2NUM(-convert.d); + convert.i = -i; + return DBL2NUM(-convert.d); } else { - convert.i = i; - return DBL2NUM(convert.d); + convert.i = i; + return DBL2NUM(convert.d); } } @@ -618,29 +618,29 @@ bsearch_integer_range(VALUE beg, VALUE end, int excl) #define BSEARCH_CHECK(expr) \ do { \ - VALUE val = (expr); \ - VALUE v = rb_yield(val); \ - if (FIXNUM_P(v)) { \ - if (v == INT2FIX(0)) return val; \ - smaller = (SIGNED_VALUE)v < 0; \ - } \ - else if (v == Qtrue) { \ - satisfied = val; \ - smaller = 1; \ - } \ - else if (!RTEST(v)) { \ - smaller = 0; \ - } \ - else if (rb_obj_is_kind_of(v, rb_cNumeric)) { \ - int cmp = rb_cmpint(rb_funcall(v, id_cmp, 1, INT2FIX(0)), v, INT2FIX(0)); \ - if (!cmp) return val; \ - smaller = cmp < 0; \ - } \ - else { \ - rb_raise(rb_eTypeError, "wrong argument type %"PRIsVALUE \ - " (must be numeric, true, false or nil)", \ - rb_obj_class(v)); \ - } \ + VALUE val = (expr); \ + VALUE v = rb_yield(val); \ + if (FIXNUM_P(v)) { \ + if (v == INT2FIX(0)) return val; \ + smaller = (SIGNED_VALUE)v < 0; \ + } \ + else if (v == Qtrue) { \ + satisfied = val; \ + smaller = 1; \ + } \ + else if (!RTEST(v)) { \ + smaller = 0; \ + } \ + else if (rb_obj_is_kind_of(v, rb_cNumeric)) { \ + int cmp = rb_cmpint(rb_funcall(v, id_cmp, 1, INT2FIX(0)), v, INT2FIX(0)); \ + if (!cmp) return val; \ + smaller = cmp < 0; \ + } \ + else { \ + rb_raise(rb_eTypeError, "wrong argument type %"PRIsVALUE \ + " (must be numeric, true, false or nil)", \ + rb_obj_class(v)); \ + } \ } while (0) VALUE low = rb_to_int(beg); @@ -653,18 +653,18 @@ bsearch_integer_range(VALUE beg, VALUE end, int excl) org_high = high; while (rb_cmpint(rb_funcall(low, id_cmp, 1, high), low, high) < 0) { - mid = rb_funcall(rb_funcall(high, '+', 1, low), id_div, 1, INT2FIX(2)); - BSEARCH_CHECK(mid); - if (smaller) { - high = mid; - } - else { - low = rb_funcall(mid, '+', 1, INT2FIX(1)); - } + mid = rb_funcall(rb_funcall(high, '+', 1, low), id_div, 1, INT2FIX(2)); + BSEARCH_CHECK(mid); + if (smaller) { + high = mid; + } + else { + low = rb_funcall(mid, '+', 1, INT2FIX(1)); + } } if (rb_equal(low, org_high)) { - BSEARCH_CHECK(low); - if (!smaller) return Qnil; + BSEARCH_CHECK(low); + if (!smaller) return Qnil; } return satisfied; } @@ -701,25 +701,25 @@ range_bsearch(VALUE range) #define BSEARCH(conv) \ do { \ - RETURN_ENUMERATOR(range, 0, 0); \ - if (EXCL(range)) high--; \ - org_high = high; \ - while (low < high) { \ - mid = ((high < 0) == (low < 0)) ? low + ((high - low) / 2) \ - : (low < -high) ? -((-1 - low - high)/2 + 1) : (low + high) / 2; \ - BSEARCH_CHECK(conv(mid)); \ - if (smaller) { \ - high = mid; \ - } \ - else { \ - low = mid + 1; \ - } \ - } \ - if (low == org_high) { \ - BSEARCH_CHECK(conv(low)); \ - if (!smaller) return Qnil; \ - } \ - return satisfied; \ + RETURN_ENUMERATOR(range, 0, 0); \ + if (EXCL(range)) high--; \ + org_high = high; \ + while (low < high) { \ + mid = ((high < 0) == (low < 0)) ? low + ((high - low) / 2) \ + : (low < -high) ? -((-1 - low - high)/2 + 1) : (low + high) / 2; \ + BSEARCH_CHECK(conv(mid)); \ + if (smaller) { \ + high = mid; \ + } \ + else { \ + low = mid + 1; \ + } \ + } \ + if (low == org_high) { \ + BSEARCH_CHECK(conv(low)); \ + if (!smaller) return Qnil; \ + } \ + return satisfied; \ } while (0) @@ -727,49 +727,49 @@ range_bsearch(VALUE range) end = RANGE_END(range); if (FIXNUM_P(beg) && FIXNUM_P(end)) { - long low = FIX2LONG(beg); - long high = FIX2LONG(end); - long mid, org_high; - BSEARCH(INT2FIX); + long low = FIX2LONG(beg); + long high = FIX2LONG(end); + long mid, org_high; + BSEARCH(INT2FIX); } #if SIZEOF_DOUBLE == 8 && defined(HAVE_INT64_T) else if (RB_FLOAT_TYPE_P(beg) || RB_FLOAT_TYPE_P(end)) { - int64_t low = double_as_int64(NIL_P(beg) ? -HUGE_VAL : RFLOAT_VALUE(rb_Float(beg))); - int64_t high = double_as_int64(NIL_P(end) ? HUGE_VAL : RFLOAT_VALUE(rb_Float(end))); - int64_t mid, org_high; - BSEARCH(int64_as_double_to_num); + int64_t low = double_as_int64(NIL_P(beg) ? -HUGE_VAL : RFLOAT_VALUE(rb_Float(beg))); + int64_t high = double_as_int64(NIL_P(end) ? HUGE_VAL : RFLOAT_VALUE(rb_Float(end))); + int64_t mid, org_high; + BSEARCH(int64_as_double_to_num); } #endif else if (is_integer_p(beg) && is_integer_p(end)) { - RETURN_ENUMERATOR(range, 0, 0); - return bsearch_integer_range(beg, end, EXCL(range)); + RETURN_ENUMERATOR(range, 0, 0); + return bsearch_integer_range(beg, end, EXCL(range)); } else if (is_integer_p(beg) && NIL_P(end)) { - VALUE diff = LONG2FIX(1); - RETURN_ENUMERATOR(range, 0, 0); - while (1) { - VALUE mid = rb_funcall(beg, '+', 1, diff); - BSEARCH_CHECK(mid); - if (smaller) { - return bsearch_integer_range(beg, mid, 0); - } - diff = rb_funcall(diff, '*', 1, LONG2FIX(2)); - } + VALUE diff = LONG2FIX(1); + RETURN_ENUMERATOR(range, 0, 0); + while (1) { + VALUE mid = rb_funcall(beg, '+', 1, diff); + BSEARCH_CHECK(mid); + if (smaller) { + return bsearch_integer_range(beg, mid, 0); + } + diff = rb_funcall(diff, '*', 1, LONG2FIX(2)); + } } else if (NIL_P(beg) && is_integer_p(end)) { - VALUE diff = LONG2FIX(-1); - RETURN_ENUMERATOR(range, 0, 0); - while (1) { - VALUE mid = rb_funcall(end, '+', 1, diff); - BSEARCH_CHECK(mid); - if (!smaller) { - return bsearch_integer_range(mid, end, 0); - } - diff = rb_funcall(diff, '*', 1, LONG2FIX(2)); - } + VALUE diff = LONG2FIX(-1); + RETURN_ENUMERATOR(range, 0, 0); + while (1) { + VALUE mid = rb_funcall(end, '+', 1, diff); + BSEARCH_CHECK(mid); + if (!smaller) { + return bsearch_integer_range(mid, end, 0); + } + diff = rb_funcall(diff, '*', 1, LONG2FIX(2)); + } } else { - rb_raise(rb_eTypeError, "can't do binary search for %s", rb_obj_classname(beg)); + rb_raise(rb_eTypeError, "can't do binary search for %s", rb_obj_classname(beg)); } return range; } @@ -809,7 +809,7 @@ range_size(VALUE range) VALUE b = RANGE_BEG(range), e = RANGE_END(range); if (rb_obj_is_kind_of(b, rb_cNumeric)) { if (rb_obj_is_kind_of(e, rb_cNumeric)) { - return ruby_num_interval_step_size(b, e, INT2FIX(1), EXCL(range)); + return ruby_num_interval_step_size(b, e, INT2FIX(1), EXCL(range)); } if (NIL_P(e)) { return DBL2NUM(HUGE_VAL); @@ -840,7 +840,7 @@ static VALUE range_to_a(VALUE range) { if (NIL_P(RANGE_END(range))) { - rb_raise(rb_eRangeError, "cannot convert endless range to an array"); + rb_raise(rb_eRangeError, "cannot convert endless range to an array"); } return rb_call_super(0, 0); } @@ -918,78 +918,78 @@ range_each(VALUE range) return range_each_fixnum_loop(beg, end, range); } else if (RB_INTEGER_TYPE_P(beg) && (NIL_P(end) || RB_INTEGER_TYPE_P(end))) { - if (SPECIAL_CONST_P(end) || RBIGNUM_POSITIVE_P(end)) { /* end >= FIXNUM_MIN */ - if (!FIXNUM_P(beg)) { - if (RBIGNUM_NEGATIVE_P(beg)) { - do { - rb_yield(beg); - } while (!FIXNUM_P(beg = rb_big_plus(beg, INT2FIX(1)))); + if (SPECIAL_CONST_P(end) || RBIGNUM_POSITIVE_P(end)) { /* end >= FIXNUM_MIN */ + if (!FIXNUM_P(beg)) { + if (RBIGNUM_NEGATIVE_P(beg)) { + do { + rb_yield(beg); + } while (!FIXNUM_P(beg = rb_big_plus(beg, INT2FIX(1)))); if (NIL_P(end)) range_each_fixnum_endless(beg); if (FIXNUM_P(end)) return range_each_fixnum_loop(beg, end, range); - } - else { + } + else { if (NIL_P(end)) range_each_bignum_endless(beg); - if (FIXNUM_P(end)) return range; - } - } - if (FIXNUM_P(beg)) { - i = FIX2LONG(beg); - do { - rb_yield(LONG2FIX(i)); - } while (POSFIXABLE(++i)); - beg = LONG2NUM(i); - } - ASSUME(!FIXNUM_P(beg)); - ASSUME(!SPECIAL_CONST_P(end)); - } - if (!FIXNUM_P(beg) && RBIGNUM_SIGN(beg) == RBIGNUM_SIGN(end)) { - if (EXCL(range)) { - while (rb_big_cmp(beg, end) == INT2FIX(-1)) { - rb_yield(beg); - beg = rb_big_plus(beg, INT2FIX(1)); - } - } - else { - VALUE c; - while ((c = rb_big_cmp(beg, end)) != INT2FIX(1)) { - rb_yield(beg); - if (c == INT2FIX(0)) break; - beg = rb_big_plus(beg, INT2FIX(1)); - } - } - } + if (FIXNUM_P(end)) return range; + } + } + if (FIXNUM_P(beg)) { + i = FIX2LONG(beg); + do { + rb_yield(LONG2FIX(i)); + } while (POSFIXABLE(++i)); + beg = LONG2NUM(i); + } + ASSUME(!FIXNUM_P(beg)); + ASSUME(!SPECIAL_CONST_P(end)); + } + if (!FIXNUM_P(beg) && RBIGNUM_SIGN(beg) == RBIGNUM_SIGN(end)) { + if (EXCL(range)) { + while (rb_big_cmp(beg, end) == INT2FIX(-1)) { + rb_yield(beg); + beg = rb_big_plus(beg, INT2FIX(1)); + } + } + else { + VALUE c; + while ((c = rb_big_cmp(beg, end)) != INT2FIX(1)) { + rb_yield(beg); + if (c == INT2FIX(0)) break; + beg = rb_big_plus(beg, INT2FIX(1)); + } + } + } } else if (SYMBOL_P(beg) && (NIL_P(end) || SYMBOL_P(end))) { /* symbols are special */ - beg = rb_sym2str(beg); - if (NIL_P(end)) { - rb_str_upto_endless_each(beg, sym_each_i, 0); - } - else { - rb_str_upto_each(beg, rb_sym2str(end), EXCL(range), sym_each_i, 0); - } + beg = rb_sym2str(beg); + if (NIL_P(end)) { + rb_str_upto_endless_each(beg, sym_each_i, 0); + } + else { + rb_str_upto_each(beg, rb_sym2str(end), EXCL(range), sym_each_i, 0); + } } else { - VALUE tmp = rb_check_string_type(beg); - - if (!NIL_P(tmp)) { - if (!NIL_P(end)) { - rb_str_upto_each(tmp, end, EXCL(range), each_i, 0); - } - else { - rb_str_upto_endless_each(tmp, each_i, 0); - } - } - else { - if (!discrete_object_p(beg)) { - rb_raise(rb_eTypeError, "can't iterate from %s", - rb_obj_classname(beg)); - } - if (!NIL_P(end)) - range_each_func(range, each_i, 0); - else - for (;; beg = rb_funcallv(beg, id_succ, 0, 0)) - rb_yield(beg); - } + VALUE tmp = rb_check_string_type(beg); + + if (!NIL_P(tmp)) { + if (!NIL_P(end)) { + rb_str_upto_each(tmp, end, EXCL(range), each_i, 0); + } + else { + rb_str_upto_endless_each(tmp, each_i, 0); + } + } + else { + if (!discrete_object_p(beg)) { + rb_raise(rb_eTypeError, "can't iterate from %s", + rb_obj_classname(beg)); + } + if (!NIL_P(end)) + range_each_func(range, each_i, 0); + else + for (;; beg = rb_funcallv(beg, id_succ, 0, 0)) + rb_yield(beg); + } } return range; } @@ -1041,7 +1041,7 @@ first_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, cbarg)) long n = NUM2LONG(ary[0]); if (n <= 0) { - rb_iter_break(); + rb_iter_break(); } rb_ary_push(ary[1], i); n--; @@ -1282,27 +1282,27 @@ static VALUE range_min(int argc, VALUE *argv, VALUE range) { if (NIL_P(RANGE_BEG(range))) { - rb_raise(rb_eRangeError, "cannot get the minimum of beginless range"); + rb_raise(rb_eRangeError, "cannot get the minimum of beginless range"); } if (rb_block_given_p()) { if (NIL_P(RANGE_END(range))) { rb_raise(rb_eRangeError, "cannot get the minimum of endless range with custom comparison method"); } - return rb_call_super(argc, argv); + return rb_call_super(argc, argv); } else if (argc != 0) { - return range_first(argc, argv, range); + return range_first(argc, argv, range); } else { - struct cmp_opt_data cmp_opt = { 0, 0 }; - VALUE b = RANGE_BEG(range); - VALUE e = RANGE_END(range); - int c = NIL_P(e) ? -1 : OPTIMIZED_CMP(b, e, cmp_opt); + struct cmp_opt_data cmp_opt = { 0, 0 }; + VALUE b = RANGE_BEG(range); + VALUE e = RANGE_END(range); + int c = NIL_P(e) ? -1 : OPTIMIZED_CMP(b, e, cmp_opt); - if (c > 0 || (c == 0 && EXCL(range))) - return Qnil; - return b; + if (c > 0 || (c == 0 && EXCL(range))) + return Qnil; + return b; } } @@ -1394,7 +1394,7 @@ range_max(int argc, VALUE *argv, VALUE range) int nm = FIXNUM_P(e) || rb_obj_is_kind_of(e, rb_cNumeric); if (NIL_P(RANGE_END(range))) { - rb_raise(rb_eRangeError, "cannot get the maximum of endless range"); + rb_raise(rb_eRangeError, "cannot get the maximum of endless range"); } VALUE b = RANGE_BEG(range); @@ -1493,22 +1493,22 @@ rb_range_values(VALUE range, VALUE *begp, VALUE *endp, int *exclp) int excl; if (rb_obj_is_kind_of(range, rb_cRange)) { - b = RANGE_BEG(range); - e = RANGE_END(range); - excl = EXCL(range); + b = RANGE_BEG(range); + e = RANGE_END(range); + excl = EXCL(range); } else if (RTEST(rb_obj_is_kind_of(range, rb_cArithSeq))) { return (int)Qfalse; } else { - VALUE x; - b = rb_check_funcall(range, id_beg, 0, 0); - if (b == Qundef) return (int)Qfalse; - e = rb_check_funcall(range, id_end, 0, 0); - if (e == Qundef) return (int)Qfalse; - x = rb_check_funcall(range, rb_intern("exclude_end?"), 0, 0); - if (x == Qundef) return (int)Qfalse; - excl = RTEST(x); + VALUE x; + b = rb_check_funcall(range, id_beg, 0, 0); + if (b == Qundef) return (int)Qfalse; + e = rb_check_funcall(range, id_end, 0, 0); + if (e == Qundef) return (int)Qfalse; + x = rb_check_funcall(range, rb_intern("exclude_end?"), 0, 0); + if (x == Qundef) return (int)Qfalse; + excl = RTEST(x); } *begp = b; *endp = e; @@ -1632,7 +1632,7 @@ inspect_range(VALUE range, VALUE dummy, int recur) VALUE str, str2 = Qundef; if (recur) { - return rb_str_new2(EXCL(range) ? "(... ... ...)" : "(... .. ...)"); + return rb_str_new2(EXCL(range) ? "(... ... ...)" : "(... .. ...)"); } if (!NIL_P(RANGE_BEG(range)) || NIL_P(RANGE_END(range))) { str = rb_str_dup(rb_inspect(RANGE_BEG(range))); @@ -1772,12 +1772,12 @@ range_include_internal(VALUE range, VALUE val, int string_use_cover) VALUE beg = RANGE_BEG(range); VALUE end = RANGE_END(range); int nv = FIXNUM_P(beg) || FIXNUM_P(end) || - linear_object_p(beg) || linear_object_p(end); + linear_object_p(beg) || linear_object_p(end); if (nv || - !NIL_P(rb_check_to_integer(beg, "to_int")) || - !NIL_P(rb_check_to_integer(end, "to_int"))) { - return r_cover_p(range, beg, end, val); + !NIL_P(rb_check_to_integer(beg, "to_int")) || + !NIL_P(rb_check_to_integer(end, "to_int"))) { + return r_cover_p(range, beg, end, val); } else if (RB_TYPE_P(beg, T_STRING) || RB_TYPE_P(end, T_STRING)) { if (RB_TYPE_P(beg, T_STRING) && RB_TYPE_P(end, T_STRING)) { @@ -1790,18 +1790,18 @@ range_include_internal(VALUE range, VALUE val, int string_use_cover) } } else if (NIL_P(beg)) { - VALUE r = rb_funcall(val, id_cmp, 1, end); - if (NIL_P(r)) return Qfalse; + VALUE r = rb_funcall(val, id_cmp, 1, end); + if (NIL_P(r)) return Qfalse; if (RANGE_EXCL(range)) { return RBOOL(rb_cmpint(r, val, end) < 0); } return RBOOL(rb_cmpint(r, val, end) <= 0); } - else if (NIL_P(end)) { - VALUE r = rb_funcall(beg, id_cmp, 1, val); - if (NIL_P(r)) return Qfalse; + else if (NIL_P(end)) { + VALUE r = rb_funcall(beg, id_cmp, 1, val); + if (NIL_P(r)) return Qfalse; return RBOOL(rb_cmpint(r, beg, val) <= 0); - } + } } return Qundef; } @@ -2000,9 +2000,9 @@ static VALUE r_cover_p(VALUE range, VALUE beg, VALUE end, VALUE val) { if (NIL_P(beg) || r_less(beg, val) <= 0) { - int excl = EXCL(range); - if (NIL_P(end) || r_less(val, end) <= -excl) - return Qtrue; + int excl = EXCL(range); + if (NIL_P(end) || r_less(val, end) <= -excl) + return Qtrue; } return Qfalse; } @@ -2032,7 +2032,7 @@ range_loader(VALUE range, VALUE obj) end = rb_ivar_get(obj, id_end); excl = rb_ivar_get(obj, id_excl); if (!NIL_P(excl)) { - range_init(range, beg, end, RBOOL(RTEST(excl))); + range_init(range, beg, end, RBOOL(RTEST(excl))); } return range; } -- cgit v1.2.1