From db9fc2be8d8f06e7100afa3e09707c9dd59eea5d Mon Sep 17 00:00:00 2001 From: Masaki Muranaka Date: Tue, 19 Mar 2013 10:39:08 +0900 Subject: Use mrb_true_or_false_value() / in num_eql(). --- src/numeric.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'src/numeric.c') diff --git a/src/numeric.c b/src/numeric.c index 2cd255a2d..b3b4a0cad 100644 --- a/src/numeric.c +++ b/src/numeric.c @@ -380,15 +380,17 @@ static mrb_value num_eql(mrb_state *mrb, mrb_value x) { mrb_value y; + mrb_bool eql_p; mrb_get_args(mrb, "o", &y); - if (mrb_type(x) != mrb_type(y)) return mrb_false_value(); - if (mrb_equal(mrb, x, y)) { - return mrb_true_value(); + if (mrb_type(x) != mrb_type(y)) { + eql_p = 0; } else { - return mrb_false_value(); + eql_p = mrb_equal(mrb, x, y); } + + return mrb_true_or_false_value(eql_p); } static mrb_value -- cgit v1.2.3 From 42ef934da38b9728fc8e597bdc169f14050d669d Mon Sep 17 00:00:00 2001 From: Masaki Muranaka Date: Tue, 19 Mar 2013 10:39:20 +0900 Subject: Use mrb_true_or_false_value() / in flo_eq(). --- src/numeric.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/numeric.c') diff --git a/src/numeric.c b/src/numeric.c index b3b4a0cad..2e9125fba 100644 --- a/src/numeric.c +++ b/src/numeric.c @@ -432,7 +432,7 @@ flo_eq(mrb_state *mrb, mrb_value x) return num_equal(mrb, x, y); } a = mrb_float(x); - return (a == b)?mrb_true_value():mrb_false_value(); + return mrb_true_or_false_value(a == b); } /* 15.2.8.3.18 */ -- cgit v1.2.3 From 698e2815adeb9894cd02096a962fe669308fbb3c Mon Sep 17 00:00:00 2001 From: Masaki Muranaka Date: Tue, 19 Mar 2013 10:39:41 +0900 Subject: Use mrb_true_or_false_value() / in flo_finite_p(). --- src/numeric.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/numeric.c') diff --git a/src/numeric.c b/src/numeric.c index 2e9125fba..e1f6fb6b2 100644 --- a/src/numeric.c +++ b/src/numeric.c @@ -513,10 +513,11 @@ static mrb_value flo_finite_p(mrb_state *mrb, mrb_value num) { mrb_float value = mrb_float(num); + mrb_bool finite_p; - if (isinf(value) || isnan(value)) - return mrb_false_value(); - return mrb_true_value(); + finite_p = !(isinf(value) || isnan(value)); + + return mrb_true_or_false_value(finite_p); } /* 15.2.9.3.10 */ -- cgit v1.2.3 From 992af98b323530248d1d7732dbe48b70da913ad8 Mon Sep 17 00:00:00 2001 From: Masaki Muranaka Date: Tue, 19 Mar 2013 10:39:53 +0900 Subject: Use mrb_true_or_false_value() / in fix_equal(). --- src/numeric.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) (limited to 'src/numeric.c') diff --git a/src/numeric.c b/src/numeric.c index e1f6fb6b2..262fa921a 100644 --- a/src/numeric.c +++ b/src/numeric.c @@ -926,19 +926,15 @@ static mrb_value fix_equal(mrb_state *mrb, mrb_value x) { mrb_value y; + mrb_bool equal_p; mrb_get_args(mrb, "o", &y); - if (mrb_obj_equal(mrb, x, y)) return mrb_true_value(); - switch (mrb_type(y)) { - case MRB_TT_FLOAT: - if ((mrb_float)mrb_fixnum(x) == mrb_float(y)) - return mrb_true_value(); - /* fall through */ - case MRB_TT_FIXNUM: - default: - return mrb_false_value(); - } + equal_p = mrb_obj_equal(mrb, x, y) || + (mrb_type(y) == MRB_TT_FLOAT && + (mrb_float)mrb_fixnum(x) == mrb_float(y)); + + return mrb_true_or_false_value(equal_p); } /* 15.2.8.3.8 */ -- cgit v1.2.3