summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorS-H-GAMELINKS <gamelinks007@gmail.com>2022-06-29 21:59:39 +0900
committerNobuyoshi Nakada <nobu@ruby-lang.org>2022-08-19 09:47:43 +0900
commitf09536175853d883130c2e54a1d418b497890462 (patch)
tree3fcd21aeeaf6951a6f3f58587e4bf48dbcafbe53
parent35c794b26d406c39f90e188e3884003fe6aca532 (diff)
Repalce to NIL_P macro
Notes
Notes: Merged: https://github.com/ruby/ruby/pull/6073
-rw-r--r--parse.y2
-rw-r--r--variable.c2
-rw-r--r--vm_insnhelper.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/parse.y b/parse.y
index d0f37a18cc..cdb7b4b93c 100644
--- a/parse.y
+++ b/parse.y
@@ -13612,7 +13612,7 @@ ripper_validate_object(VALUE self, VALUE x)
{
if (x == Qfalse) return x;
if (x == Qtrue) return x;
- if (x == Qnil) return x;
+ if (NIL_P(x)) return x;
if (x == Qundef)
rb_raise(rb_eArgError, "Qundef given");
if (FIXNUM_P(x)) return x;
diff --git a/variable.c b/variable.c
index a3512adc99..056a1000b8 100644
--- a/variable.c
+++ b/variable.c
@@ -2605,7 +2605,7 @@ autoload_load_needed(VALUE _arguments)
return Qfalse;
}
- if (autoload_data->mutex == Qnil) {
+ if (NIL_P(autoload_data->mutex)) {
autoload_data->mutex = rb_mutex_new();
autoload_data->fork_gen = GET_VM()->fork_gen;
}
diff --git a/vm_insnhelper.c b/vm_insnhelper.c
index 1812f7ce71..837c71ffd5 100644
--- a/vm_insnhelper.c
+++ b/vm_insnhelper.c
@@ -4841,7 +4841,7 @@ vm_objtostring(const rb_iseq_t *iseq, VALUE recv, CALL_DATA cd)
// going to use this string for interpolation, it's fine to use the
// frozen string.
VALUE val = rb_mod_name(recv);
- if (val == Qnil) {
+ if (NIL_P(val)) {
val = rb_mod_to_s(recv);
}
return val;