admin/mruby-mruby
1
0
Fork 0
mirror of https://github.com/mruby/mruby synced 2026-06-08 16:11:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:mruby/mruby

Browse Source
This commit is contained in:
Yukihiro "Matz" Matsumoto
2014-04-26 12:08:11 +09:00
parent e76be4e2ab 55251cb14f
commit 773097d3a8
1 changed files with 4 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/numeric.c
+4 -13
View File
@@ -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)