From 9e6e39c3512f7a962c44dc3729c98a0f8be90341 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8D=9C=E9=83=A8=E6=98=8C=E5=B9=B3?= Date: Wed, 8 Apr 2020 13:28:13 +0900 Subject: Merge pull request #2991 from shyouhei/ruby.h Split ruby.h --- range.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'range.c') diff --git a/range.c b/range.c index 8309016808..a77d324f85 100644 --- a/range.c +++ b/range.c @@ -9,7 +9,7 @@ **********************************************************************/ -#include "ruby/config.h" +#include "ruby/3/config.h" #include #include @@ -1001,7 +1001,7 @@ first_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, cbarg)) } rb_ary_push(ary[1], i); n--; - ary[0] = INT2NUM(n); + ary[0] = LONG2NUM(n); return Qnil; } @@ -1554,7 +1554,7 @@ r_cover_range_p(VALUE range, VALUE beg, VALUE end, VALUE val) if (!NIL_P(end) && NIL_P(val_end)) return FALSE; if (!NIL_P(beg) && NIL_P(val_beg)) return FALSE; - if (!NIL_P(val_beg) && !NIL_P(val_end) && r_less(val_beg, val_end) > -EXCL(val)) return FALSE; + if (!NIL_P(val_beg) && !NIL_P(val_end) && r_less(val_beg, val_end) > (EXCL(val) ? -1 : 0)) return FALSE; if (!NIL_P(val_beg) && !r_cover_p(range, beg, end, val_beg)) return FALSE; cmp_end = r_less(end, val_end); -- cgit v1.2.3