Skip to content

Commit

Permalink
Some codes replace to RBOOL macro (#5023)
Browse files Browse the repository at this point in the history
* Some code replace and using RBOOL macro

* Fix indent

* Using RBOOL in syserr_eqq function
  • Loading branch information
S-H-GAMELINKS committed Nov 9, 2021
1 parent c1c13c5 commit 75aae66
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 29 deletions.
4 changes: 1 addition & 3 deletions error.c
Expand Up @@ -2421,9 +2421,7 @@ syserr_eqq(VALUE self, VALUE exc)
num = rb_funcallv(exc, id_errno, 0, 0);
}
e = rb_const_get(self, id_Errno);
if (FIXNUM_P(num) ? num == e : rb_equal(num, e))
return Qtrue;
return Qfalse;
return RBOOL(FIXNUM_P(num) ? num == e : rb_equal(num, e));
}


Expand Down
20 changes: 4 additions & 16 deletions process.c
Expand Up @@ -898,10 +898,7 @@ pst_wifstopped(VALUE st)
{
int status = PST2INT(st);

if (WIFSTOPPED(status))
return Qtrue;
else
return Qfalse;
return RBOOL(WIFSTOPPED(status));
}


Expand Down Expand Up @@ -937,10 +934,7 @@ pst_wifsignaled(VALUE st)
{
int status = PST2INT(st);

if (WIFSIGNALED(status))
return Qtrue;
else
return Qfalse;
return RBOOL(WIFSIGNALED(status));
}


Expand Down Expand Up @@ -978,10 +972,7 @@ pst_wifexited(VALUE st)
{
int status = PST2INT(st);

if (WIFEXITED(status))
return Qtrue;
else
return Qfalse;
return RBOOL(WIFEXITED(status));
}


Expand Down Expand Up @@ -1047,10 +1038,7 @@ pst_wcoredump(VALUE st)
#ifdef WCOREDUMP
int status = PST2INT(st);

if (WCOREDUMP(status))
return Qtrue;
else
return Qfalse;
return RBOOL(WCOREDUMP(status));
#else
return Qfalse;
#endif
Expand Down
6 changes: 2 additions & 4 deletions range.c
Expand Up @@ -1792,14 +1792,12 @@ range_include_internal(VALUE range, VALUE val, int string_use_cover)
else if (NIL_P(beg)) {
VALUE r = rb_funcall(val, id_cmp, 1, end);
if (NIL_P(r)) return Qfalse;
if (rb_cmpint(r, val, end) <= 0) return Qtrue;
return Qfalse;
return RBOOL(rb_cmpint(r, val, end) <= 0);
}
else if (NIL_P(end)) {
VALUE r = rb_funcall(beg, id_cmp, 1, val);
if (NIL_P(r)) return Qfalse;
if (rb_cmpint(r, beg, val) <= 0) return Qtrue;
return Qfalse;
return RBOOL(rb_cmpint(r, beg, val) <= 0);
}
}
return Qundef;
Expand Down
7 changes: 1 addition & 6 deletions thread.c
Expand Up @@ -3326,12 +3326,7 @@ rb_thread_status(VALUE thread)
static VALUE
rb_thread_alive_p(VALUE thread)
{
if (thread_finished(rb_thread_ptr(thread))) {
return Qfalse;
}
else {
return Qtrue;
}
return RBOOL(!thread_finished(rb_thread_ptr(thread)));
}

/*
Expand Down

0 comments on commit 75aae66

Please sign in to comment.