diff options
| author | S-H-GAMELINKS <gamelinks007@gmail.com> | 2021-10-06 20:18:35 +0900 |
|---|---|---|
| committer | Samuel Williams <samuel.williams@oriontransfer.co.nz> | 2021-10-07 19:18:46 +1300 |
| commit | 323e7a6744a18a729d8011e237e64291cb6c02bd (patch) | |
| tree | ba34c69a488ce55aa842038b7baec6b05a77e194 /variable.c | |
| parent | 273673aeafd5e5a40a6212de17c788c2c029865e (diff) | |
Merge if statement
Notes
Notes:
Merged: https://github.com/ruby/ruby/pull/4939
Diffstat (limited to 'variable.c')
| -rw-r--r-- | variable.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/variable.c b/variable.c index c6e1012bdd..8bdc733a4c 100644 --- a/variable.c +++ b/variable.c @@ -2973,10 +2973,7 @@ set_namespace_path_i(ID id, VALUE v, void *payload) VALUE value = ce->value; int has_permanent_classpath; VALUE parental_path = *((VALUE *) payload); - if (!rb_is_const_id(id)) { - return ID_TABLE_CONTINUE; - } - if (!rb_namespace_p(value)) { + if (!rb_is_const_id(id) || !rb_namespace_p(value)) { return ID_TABLE_CONTINUE; } classname(value, &has_permanent_classpath); |