summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorYukihiro "Matz" Matsumoto <[email protected]>2014-04-26 12:03:38 +0900
committerYukihiro "Matz" Matsumoto <[email protected]>2014-04-26 12:03:38 +0900
commit55251cb14fed038f093a17e6c6be26e2f5b0474b (patch)
treefb6067e8e53479ec4993d84afa2188daa3d0f53e
parentb1b3ee4547ec1cda4157ea92af85942f3384c101 (diff)
parent68ce209f7ef1352c80544b19a8072b04688555b7 (diff)
downloadmruby-55251cb14fed038f093a17e6c6be26e2f5b0474b.tar.gz
mruby-55251cb14fed038f093a17e6c6be26e2f5b0474b.zip
Merge pull request #2130 from suzukaze/refactor-numeric.c
Refactor numeric.c
-rw-r--r--src/numeric.c17
1 files changed, 4 insertions, 13 deletions
diff --git a/src/numeric.c b/src/numeric.c
index bda667280..ef7b5fc82 100644
--- a/src/numeric.c
+++ b/src/numeric.c
@@ -494,11 +494,8 @@ static mrb_value
flo_finite_p(mrb_state *mrb, mrb_value num)
{
mrb_float value = mrb_float(num);
- mrb_bool finite_p;
- finite_p = !(isinf(value) || isnan(value));
-
- return mrb_bool_value(finite_p);
+ return mrb_bool_value(!(isinf(value) || isnan(value)));
}
/* 15.2.9.3.10 */
@@ -918,13 +915,11 @@ static mrb_value
fix_and(mrb_state *mrb, mrb_value x)
{
mrb_value y;
- mrb_int val;
mrb_get_args(mrb, "o", &y);
y = bit_coerce(mrb, y);
- val = mrb_fixnum(x) & mrb_fixnum(y);
- return mrb_fixnum_value(val);
+ return mrb_fixnum_value(mrb_fixnum(x) & mrb_fixnum(y));
}
/* 15.2.8.3.10 */
@@ -939,13 +934,11 @@ static mrb_value
fix_or(mrb_state *mrb, mrb_value x)
{
mrb_value y;
- mrb_int val;
mrb_get_args(mrb, "o", &y);
y = bit_coerce(mrb, y);
- val = mrb_fixnum(x) | mrb_fixnum(y);
- return mrb_fixnum_value(val);
+ return mrb_fixnum_value(mrb_fixnum(x) | mrb_fixnum(y));
}
/* 15.2.8.3.11 */
@@ -960,13 +953,11 @@ static mrb_value
fix_xor(mrb_state *mrb, mrb_value x)
{
mrb_value y;
- mrb_int val;
mrb_get_args(mrb, "o", &y);
y = bit_coerce(mrb, y);
- val = mrb_fixnum(x) ^ mrb_fixnum(y);
- return mrb_fixnum_value(val);
+ return mrb_fixnum_value(mrb_fixnum(x) ^ mrb_fixnum(y));
}
#define NUMERIC_SHIFT_WIDTH_MAX (MRB_INT_BIT-1)