diff options
| author | Yukihiro "Matz" Matsumoto <[email protected]> | 2019-04-10 19:34:58 +0900 |
|---|---|---|
| committer | GitHub <[email protected]> | 2019-04-10 19:34:58 +0900 |
| commit | 9c252410cf6e43eb7e19683844c83581445fc089 (patch) | |
| tree | 9394f7ca605da6972b399ac48fd31fc3aad72b62 /src/kernel.c | |
| parent | 4776ac50ed39652e56a084475a5d79c1bbccc6c0 (diff) | |
| parent | 7b0ebed033777cd8bdb8e3668e5c49cfe1b69c5d (diff) | |
| download | mruby-9c252410cf6e43eb7e19683844c83581445fc089.tar.gz mruby-9c252410cf6e43eb7e19683844c83581445fc089.zip | |
Merge pull request #4368 from shuujii/use-mrb_immediate_p-in-mrb_obj_freeze-and-mrb_obj_frozen
Use `mrb_immediate_p()` in `mrb_obj_freeze()` and `mrb_obj_frozen()`
Diffstat (limited to 'src/kernel.c')
| -rw-r--r-- | src/kernel.c | 44 |
1 files changed, 6 insertions, 38 deletions
diff --git a/src/kernel.c b/src/kernel.c index 7890e3dac..d9a1d36ce 100644 --- a/src/kernel.c +++ b/src/kernel.c @@ -434,24 +434,11 @@ mrb_obj_extend_m(mrb_state *mrb, mrb_value self) static mrb_value mrb_obj_freeze(mrb_state *mrb, mrb_value self) { - struct RBasic *b; - - switch (mrb_type(self)) { - case MRB_TT_FALSE: - case MRB_TT_TRUE: - case MRB_TT_FIXNUM: - case MRB_TT_SYMBOL: -#ifndef MRB_WITHOUT_FLOAT - case MRB_TT_FLOAT: -#endif - return self; - default: - break; - } - - b = mrb_basic_ptr(self); - if (!MRB_FROZEN_P(b)) { - MRB_SET_FROZEN_FLAG(b); + if (!mrb_immediate_p(self)) { + struct RBasic *b = mrb_basic_ptr(self); + if (!MRB_FROZEN_P(b)) { + MRB_SET_FROZEN_FLAG(b); + } } return self; } @@ -459,26 +446,7 @@ mrb_obj_freeze(mrb_state *mrb, mrb_value self) static mrb_value mrb_obj_frozen(mrb_state *mrb, mrb_value self) { - struct RBasic *b; - - switch (mrb_type(self)) { - case MRB_TT_FALSE: - case MRB_TT_TRUE: - case MRB_TT_FIXNUM: - case MRB_TT_SYMBOL: -#ifndef MRB_WITHOUT_FLOAT - case MRB_TT_FLOAT: -#endif - return mrb_true_value(); - default: - break; - } - - b = mrb_basic_ptr(self); - if (!MRB_FROZEN_P(b)) { - return mrb_false_value(); - } - return mrb_true_value(); + return mrb_bool_value(mrb_immediate_p(self) || MRB_FROZEN_P(mrb_basic_ptr(self))); } /* 15.3.1.3.15 */ |