diff options
| author | Yukihiro "Matz" Matsumoto <[email protected]> | 2014-03-09 03:16:28 +0900 |
|---|---|---|
| committer | Yukihiro "Matz" Matsumoto <[email protected]> | 2014-03-09 03:16:28 +0900 |
| commit | 4f27089b4ad915b7bda151a49694dcc8fbb4a2fc (patch) | |
| tree | 1b245362973ffc134a277085ab29a924dcbac920 /src/numeric.c | |
| parent | 6423011986aca8e71508a8ffe6df823e44c196bd (diff) | |
| parent | bc663549eae0d16a2adb0cb0b1b68d34befe501c (diff) | |
| download | mruby-4f27089b4ad915b7bda151a49694dcc8fbb4a2fc.tar.gz mruby-4f27089b4ad915b7bda151a49694dcc8fbb4a2fc.zip | |
Merge branch 'master' of github.com:mruby/mruby
Diffstat (limited to 'src/numeric.c')
| -rw-r--r-- | src/numeric.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/numeric.c b/src/numeric.c index 5f23b2461..5d0269e00 100644 --- a/src/numeric.c +++ b/src/numeric.c @@ -304,8 +304,8 @@ flodivmod(mrb_state *mrb, mrb_float x, mrb_float y, mrb_float *divp, mrb_float * mrb_float mod; if (y == 0.0) { - div = str_to_mrb_float("inf"); - mod = str_to_mrb_float("nan"); + div = INFINITY; + mod = NAN; } else { mod = fmod(x, y); @@ -775,7 +775,7 @@ fix_mod(mrb_state *mrb, mrb_value x) mrb_int mod; if (mrb_fixnum(y) == 0) { - return mrb_float_value(mrb, str_to_mrb_float("nan")); + return mrb_float_value(mrb, NAN); } fixdivmod(mrb, a, mrb_fixnum(y), 0, &mod); return mrb_fixnum_value(mod); @@ -805,8 +805,8 @@ fix_divmod(mrb_state *mrb, mrb_value x) mrb_int div, mod; if (mrb_fixnum(y) == 0) { - return mrb_assoc_new(mrb, mrb_float_value(mrb, str_to_mrb_float("inf")), - mrb_float_value(mrb, str_to_mrb_float("nan"))); + return mrb_assoc_new(mrb, mrb_float_value(mrb, INFINITY), + mrb_float_value(mrb, NAN)); } fixdivmod(mrb, mrb_fixnum(x), mrb_fixnum(y), &div, &mod); return mrb_assoc_new(mrb, mrb_fixnum_value(div), mrb_fixnum_value(mod)); |
