diff options
| author | Yukihiro "Matz" Matsumoto <[email protected]> | 2020-08-26 17:53:04 +0900 |
|---|---|---|
| committer | Yukihiro "Matz" Matsumoto <[email protected]> | 2020-10-12 18:19:54 +0900 |
| commit | 2b188ed8a191257f23ddf6f8a27bf1d3964587ed (patch) | |
| tree | bccc235fdf9088a5486201c3855bfb2bfe04a1f2 /mrbgems/mruby-range-ext | |
| parent | 2bb84f1f1ae4bfca49bd92d8d0102a5773d3270f (diff) | |
| download | mruby-2b188ed8a191257f23ddf6f8a27bf1d3964587ed.tar.gz mruby-2b188ed8a191257f23ddf6f8a27bf1d3964587ed.zip | |
Reorganize `Integer` system.
- Integrate `Fixnum` and `Integer`
- Remove `Integral`
- `int / int -> int`
- Replace `mrb_fixnum()` to `mrb_int()`
- Replace `mrb_fixnum_value()` to `mrb_int_value()`.
- Use `mrb_integer_p()` instead of `mrb_fixnum_p()`
Diffstat (limited to 'mrbgems/mruby-range-ext')
| -rw-r--r-- | mrbgems/mruby-range-ext/src/range.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/mrbgems/mruby-range-ext/src/range.c b/mrbgems/mruby-range-ext/src/range.c index 421e7d33a..0f2cc6119 100644 --- a/mrbgems/mruby-range-ext/src/range.c +++ b/mrbgems/mruby-range-ext/src/range.c @@ -109,8 +109,8 @@ range_size(mrb_state *mrb, mrb_value range) beg = RANGE_BEG(r); end = RANGE_END(r); excl = RANGE_EXCL(r); - if (mrb_fixnum_p(beg)) { - beg_f = (mrb_float)mrb_fixnum(beg); + if (mrb_integer_p(beg)) { + beg_f = (mrb_float)mrb_integer(beg); } else if (mrb_float_p(beg)) { beg_f = mrb_float(beg); @@ -118,8 +118,8 @@ range_size(mrb_state *mrb, mrb_value range) else { num_p = FALSE; } - if (mrb_fixnum_p(end)) { - end_f = (mrb_float)mrb_fixnum(end); + if (mrb_integer_p(end)) { + end_f = (mrb_float)mrb_integer(end); } else if (mrb_float_p(end)) { end_f = mrb_float(end); @@ -161,9 +161,9 @@ range_size(mrb_state *mrb, mrb_value range) end = RANGE_END(r); excl = RANGE_EXCL(r) ? 0 : 1; - if (mrb_fixnum_p(beg) && mrb_fixnum_p(end)) { - mrb_int a = mrb_fixnum(beg); - mrb_int b = mrb_fixnum(end); + if (mrb_integer_p(beg) && mrb_integer_p(end)) { + mrb_int a = mrb_integer(beg); + mrb_int b = mrb_integer(end); mrb_int c = b - a + excl; return mrb_fixnum_value(c); |
