summaryrefslogtreecommitdiffhomepage
path: root/include
diff options
context:
space:
mode:
authorYukihiro "Matz" Matsumoto <[email protected]>2019-09-16 07:45:42 +0900
committerYukihiro "Matz" Matsumoto <[email protected]>2019-09-16 07:45:42 +0900
commita016d1d0ffb58314beb17ccd6d018fbe606c234f (patch)
tree278a8d9e8b8185b61e248085c9ebc266d039a3f4 /include
parent76355dee686254dcf51fcd42fbe13c8f00c3aa95 (diff)
parent6de1c64a9cc374cf7c201183ad7e3145ecfccae2 (diff)
downloadmruby-a016d1d0ffb58314beb17ccd6d018fbe606c234f.tar.gz
mruby-a016d1d0ffb58314beb17ccd6d018fbe606c234f.zip
Merge branch 'dearblue-mruby-io'
Diffstat (limited to 'include')
-rw-r--r--include/mruby/boxing_word.h22
1 files changed, 6 insertions, 16 deletions
diff --git a/include/mruby/boxing_word.h b/include/mruby/boxing_word.h
index 1a0c59ddb..7fda4919d 100644
--- a/include/mruby/boxing_word.h
+++ b/include/mruby/boxing_word.h
@@ -144,22 +144,12 @@ MRB_API mrb_value mrb_word_boxing_float_pool(struct mrb_state*, mrb_float);
MRB_INLINE enum mrb_vtype
mrb_type(mrb_value o)
{
- switch (o.w) {
- case MRB_Qfalse:
- case MRB_Qnil:
- return MRB_TT_FALSE;
- case MRB_Qtrue:
- return MRB_TT_TRUE;
- case MRB_Qundef:
- return MRB_TT_UNDEF;
- }
- if (mrb_fixnum_p(o)) {
- return MRB_TT_FIXNUM;
- }
- if (mrb_symbol_p(o)) {
- return MRB_TT_SYMBOL;
- }
- return o.value.bp->tt;
+ return !mrb_bool(o) ? MRB_TT_FALSE :
+ mrb_true_p(o) ? MRB_TT_TRUE :
+ mrb_fixnum_p(o) ? MRB_TT_FIXNUM :
+ mrb_symbol_p(o) ? MRB_TT_SYMBOL :
+ mrb_undef_p(o) ? MRB_TT_UNDEF :
+ o.value.bp->tt;
}
#endif /* MRUBY_BOXING_WORD_H */