summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarcandre <marcandre@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-02-28 02:04:43 +0000
committermarcandre <marcandre@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-02-28 02:04:43 +0000
commit11a57c63f3842ced2bfeb6e650e1a34cbea1a8af (patch)
treeb53b8a6f812397af32a6106876d5f867bc752994
parent814fb8e6c7d88bdd5f88088f37893c6761bad7f3 (diff)
* numeric.c: Simplify by getting rid of macro
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@45208 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--numeric.c15
1 files changed, 5 insertions, 10 deletions
diff --git a/numeric.c b/numeric.c
index 7523f4ff37..58dad48fe2 100644
--- a/numeric.c
+++ b/numeric.c
@@ -1864,14 +1864,6 @@ ruby_num_interval_step_size(VALUE from, VALUE to, VALUE step, int excl)
} \
} while (0)
-#define NUM_STEP_GET_INF(to, desc, inf) do { \
- if (RB_TYPE_P(to, T_FLOAT)) { \
- double f = RFLOAT_VALUE(to); \
- inf = isinf(f) && (signbit(f) ? desc : !desc); \
- } \
- else inf = 0; \
-} while (0)
-
static VALUE
num_step_size(VALUE from, VALUE args, VALUE eobj)
{
@@ -1947,8 +1939,11 @@ num_step(int argc, VALUE *argv, VALUE from)
RETURN_SIZED_ENUMERATOR(from, argc, argv, num_step_size);
NUM_STEP_SCAN_ARGS(argc, argv, to, step, hash, desc);
- NUM_STEP_GET_INF(to, desc, inf);
-
+ if (RB_TYPE_P(to, T_FLOAT)) {
+ double f = RFLOAT_VALUE(to);
+ inf = isinf(f) && (signbit(f) ? desc : !desc);
+ }
+ else inf = 0;
if (FIXNUM_P(from) && (inf || FIXNUM_P(to)) && FIXNUM_P(step)) {
long i = FIX2LONG(from);