diff options
| author | Yukihiro "Matz" Matsumoto <[email protected]> | 2014-04-16 15:22:50 +0900 |
|---|---|---|
| committer | Yukihiro "Matz" Matsumoto <[email protected]> | 2014-04-16 15:22:50 +0900 |
| commit | 93c82514dcce47f7c72d1ab24fcbecdacbd072d6 (patch) | |
| tree | c531e433d80f55f3eed4c767ffffc3121fe33fe3 | |
| parent | 3e00684faaeadb83bad6512ece109e84f8dd7f95 (diff) | |
| parent | cb1659c191683a81f86a576a8a80dcfbefa99146 (diff) | |
| download | mruby-93c82514dcce47f7c72d1ab24fcbecdacbd072d6.tar.gz mruby-93c82514dcce47f7c72d1ab24fcbecdacbd072d6.zip | |
Merge branch 'master' of github.com:mruby/mruby
| -rw-r--r-- | src/numeric.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/src/numeric.c b/src/numeric.c index ef9308aea..bda667280 100644 --- a/src/numeric.c +++ b/src/numeric.c @@ -980,8 +980,7 @@ lshift(mrb_state *mrb, mrb_int val, mrb_int width) mrb_fixnum_value(width), mrb_fixnum_value(NUMERIC_SHIFT_WIDTH_MAX)); } - val = val << width; - return mrb_fixnum_value(val); + return mrb_fixnum_value(val << width); } static mrb_value @@ -1009,8 +1008,7 @@ fix_shift_get_width(mrb_state *mrb, mrb_int *width) mrb_value y; mrb_get_args(mrb, "o", &y); - y = bit_coerce(mrb, y); - *width = mrb_fixnum(y); + *width = mrb_fixnum(bit_coerce(mrb, y)); } /* 15.2.8.3.12 */ @@ -1075,11 +1073,7 @@ fix_rshift(mrb_state *mrb, mrb_value x) static mrb_value fix_to_f(mrb_state *mrb, mrb_value num) { - mrb_float val; - - val = (mrb_float)mrb_fixnum(num); - - return mrb_float_value(mrb, val); + return mrb_float_value(mrb, (mrb_float)mrb_fixnum(num)); } /* |