diff options
author | S.H <gamelinks007@gmail.com> | 2021-08-02 12:06:44 +0900 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-08-02 12:06:44 +0900 |
commit | 378e8cdad69e6ba995a024da2957719789f0679e (patch) | |
tree | 99ffe0f8055bc10cba3225fb5e7a906f5c3f4543 /vm_insnhelper.c | |
parent | 3688b476710def7290e32656b200fefc538366d0 (diff) |
Using RBOOL macro
Notes
Notes:
Merged: https://github.com/ruby/ruby/pull/4695
Merged-By: nobu <nobu@ruby-lang.org>
Diffstat (limited to 'vm_insnhelper.c')
-rw-r--r-- | vm_insnhelper.c | 60 |
1 files changed, 20 insertions, 40 deletions
diff --git a/vm_insnhelper.c b/vm_insnhelper.c index 20863f971f..14928b2afe 100644 --- a/vm_insnhelper.c +++ b/vm_insnhelper.c @@ -2005,12 +2005,7 @@ opt_equality_specialized(VALUE recv, VALUE obj) } else #endif - if (a == b) { - return Qtrue; - } - else { - return Qfalse; - } + return RBOOL(a == b); } else if (RBASIC_CLASS(recv) == rb_cString && EQ_UNREDEFINED_P(STRING)) { if (recv == obj) { @@ -2023,12 +2018,7 @@ opt_equality_specialized(VALUE recv, VALUE obj) return Qundef; compare_by_identity: - if (recv == obj) { - return Qtrue; - } - else { - return Qfalse; - } + return RBOOL(recv == obj); } static VALUE @@ -2043,12 +2033,7 @@ opt_equality(const rb_iseq_t *cd_owner, VALUE recv, VALUE obj, CALL_DATA cd) return Qundef; } else { - if (recv == obj) { - return Qtrue; - } - else { - return Qfalse; - } + return RBOOL(recv == obj); } } @@ -2065,12 +2050,7 @@ opt_equality_by_mid_slowpath(VALUE recv, VALUE obj, ID mid) const struct rb_callcache *cc = gccct_method_search(GET_EC(), recv, mid, 1); if (cc && check_cfunc(vm_cc_cme(cc), rb_obj_equal)) { - if (recv == obj) { - return Qtrue; - } - else { - return Qfalse; - } + return RBOOL(recv == obj); } else { return Qundef; @@ -2143,28 +2123,28 @@ static inline VALUE double_cmp_lt(double a, double b) { CHECK_CMP_NAN(a, b); - return a < b ? Qtrue : Qfalse; + return RBOOL(a < b); } static inline VALUE double_cmp_le(double a, double b) { CHECK_CMP_NAN(a, b); - return a <= b ? Qtrue : Qfalse; + return RBOOL(a <= b); } static inline VALUE double_cmp_gt(double a, double b) { CHECK_CMP_NAN(a, b); - return a > b ? Qtrue : Qfalse; + return RBOOL(a > b); } static inline VALUE double_cmp_ge(double a, double b) { CHECK_CMP_NAN(a, b); - return a >= b ? Qtrue : Qfalse; + return RBOOL(a >= b); } static inline VALUE * @@ -4965,11 +4945,11 @@ vm_opt_lt(VALUE recv, VALUE obj) { if (FIXNUM_2_P(recv, obj) && BASIC_OP_UNREDEFINED_P(BOP_LT, INTEGER_REDEFINED_OP_FLAG)) { - return (SIGNED_VALUE)recv < (SIGNED_VALUE)obj ? Qtrue : Qfalse; + return RBOOL((SIGNED_VALUE)recv < (SIGNED_VALUE)obj); } else if (FLONUM_2_P(recv, obj) && BASIC_OP_UNREDEFINED_P(BOP_LT, FLOAT_REDEFINED_OP_FLAG)) { - return RFLOAT_VALUE(recv) < RFLOAT_VALUE(obj) ? Qtrue : Qfalse; + return RBOOL(RFLOAT_VALUE(recv) < RFLOAT_VALUE(obj)); } else if (SPECIAL_CONST_P(recv) || SPECIAL_CONST_P(obj)) { return Qundef; @@ -4978,7 +4958,7 @@ vm_opt_lt(VALUE recv, VALUE obj) RBASIC_CLASS(obj) == rb_cFloat && BASIC_OP_UNREDEFINED_P(BOP_LT, FLOAT_REDEFINED_OP_FLAG)) { CHECK_CMP_NAN(RFLOAT_VALUE(recv), RFLOAT_VALUE(obj)); - return RFLOAT_VALUE(recv) < RFLOAT_VALUE(obj) ? Qtrue : Qfalse; + return RBOOL(RFLOAT_VALUE(recv) < RFLOAT_VALUE(obj)); } else { return Qundef; @@ -4990,11 +4970,11 @@ vm_opt_le(VALUE recv, VALUE obj) { if (FIXNUM_2_P(recv, obj) && BASIC_OP_UNREDEFINED_P(BOP_LE, INTEGER_REDEFINED_OP_FLAG)) { - return (SIGNED_VALUE)recv <= (SIGNED_VALUE)obj ? Qtrue : Qfalse; + return RBOOL((SIGNED_VALUE)recv <= (SIGNED_VALUE)obj); } else if (FLONUM_2_P(recv, obj) && BASIC_OP_UNREDEFINED_P(BOP_LE, FLOAT_REDEFINED_OP_FLAG)) { - return RFLOAT_VALUE(recv) <= RFLOAT_VALUE(obj) ? Qtrue : Qfalse; + return RBOOL(RFLOAT_VALUE(recv) <= RFLOAT_VALUE(obj)); } else if (SPECIAL_CONST_P(recv) || SPECIAL_CONST_P(obj)) { return Qundef; @@ -5003,7 +4983,7 @@ vm_opt_le(VALUE recv, VALUE obj) RBASIC_CLASS(obj) == rb_cFloat && BASIC_OP_UNREDEFINED_P(BOP_LE, FLOAT_REDEFINED_OP_FLAG)) { CHECK_CMP_NAN(RFLOAT_VALUE(recv), RFLOAT_VALUE(obj)); - return RFLOAT_VALUE(recv) <= RFLOAT_VALUE(obj) ? Qtrue : Qfalse; + return RBOOL(RFLOAT_VALUE(recv) <= RFLOAT_VALUE(obj)); } else { return Qundef; @@ -5015,11 +4995,11 @@ vm_opt_gt(VALUE recv, VALUE obj) { if (FIXNUM_2_P(recv, obj) && BASIC_OP_UNREDEFINED_P(BOP_GT, INTEGER_REDEFINED_OP_FLAG)) { - return (SIGNED_VALUE)recv > (SIGNED_VALUE)obj ? Qtrue : Qfalse; + return RBOOL((SIGNED_VALUE)recv > (SIGNED_VALUE)obj); } else if (FLONUM_2_P(recv, obj) && BASIC_OP_UNREDEFINED_P(BOP_GT, FLOAT_REDEFINED_OP_FLAG)) { - return RFLOAT_VALUE(recv) > RFLOAT_VALUE(obj) ? Qtrue : Qfalse; + return RBOOL(RFLOAT_VALUE(recv) > RFLOAT_VALUE(obj)); } else if (SPECIAL_CONST_P(recv) || SPECIAL_CONST_P(obj)) { return Qundef; @@ -5028,7 +5008,7 @@ vm_opt_gt(VALUE recv, VALUE obj) RBASIC_CLASS(obj) == rb_cFloat && BASIC_OP_UNREDEFINED_P(BOP_GT, FLOAT_REDEFINED_OP_FLAG)) { CHECK_CMP_NAN(RFLOAT_VALUE(recv), RFLOAT_VALUE(obj)); - return RFLOAT_VALUE(recv) > RFLOAT_VALUE(obj) ? Qtrue : Qfalse; + return RBOOL(RFLOAT_VALUE(recv) > RFLOAT_VALUE(obj)); } else { return Qundef; @@ -5040,11 +5020,11 @@ vm_opt_ge(VALUE recv, VALUE obj) { if (FIXNUM_2_P(recv, obj) && BASIC_OP_UNREDEFINED_P(BOP_GE, INTEGER_REDEFINED_OP_FLAG)) { - return (SIGNED_VALUE)recv >= (SIGNED_VALUE)obj ? Qtrue : Qfalse; + return RBOOL((SIGNED_VALUE)recv >= (SIGNED_VALUE)obj); } else if (FLONUM_2_P(recv, obj) && BASIC_OP_UNREDEFINED_P(BOP_GE, FLOAT_REDEFINED_OP_FLAG)) { - return RFLOAT_VALUE(recv) >= RFLOAT_VALUE(obj) ? Qtrue : Qfalse; + return RBOOL(RFLOAT_VALUE(recv) >= RFLOAT_VALUE(obj)); } else if (SPECIAL_CONST_P(recv) || SPECIAL_CONST_P(obj)) { return Qundef; @@ -5053,7 +5033,7 @@ vm_opt_ge(VALUE recv, VALUE obj) RBASIC_CLASS(obj) == rb_cFloat && BASIC_OP_UNREDEFINED_P(BOP_GE, FLOAT_REDEFINED_OP_FLAG)) { CHECK_CMP_NAN(RFLOAT_VALUE(recv), RFLOAT_VALUE(obj)); - return RFLOAT_VALUE(recv) >= RFLOAT_VALUE(obj) ? Qtrue : Qfalse; + return RBOOL(RFLOAT_VALUE(recv) >= RFLOAT_VALUE(obj)); } else { return Qundef; |