From 1a4ea94bc75a989a9077d968a567e23f7e90fc78 Mon Sep 17 00:00:00 2001 From: "Yukihiro \"Matz\" Matsumoto" Date: Sat, 31 Aug 2019 23:19:08 +0900 Subject: Fix `mrb_immediate_p(MRB_TT_FREE)` to return `false`; ref #4679 --- include/mruby/boxing_nan.h | 1 - include/mruby/boxing_no.h | 1 - include/mruby/value.h | 10 ++++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/mruby/boxing_nan.h b/include/mruby/boxing_nan.h index 702fa13fb..4b47a3f17 100644 --- a/include/mruby/boxing_nan.h +++ b/include/mruby/boxing_nan.h @@ -20,7 +20,6 @@ #endif #define MRB_FIXNUM_SHIFT 0 -#define MRB_TT_HAS_BASIC MRB_TT_OBJECT #ifdef MRB_ENDIAN_BIG #define MRB_ENDIAN_LOHI(a,b) a b diff --git a/include/mruby/boxing_no.h b/include/mruby/boxing_no.h index b3b40b2cd..19372b587 100644 --- a/include/mruby/boxing_no.h +++ b/include/mruby/boxing_no.h @@ -8,7 +8,6 @@ #define MRUBY_BOXING_NO_H #define MRB_FIXNUM_SHIFT 0 -#define MRB_TT_HAS_BASIC MRB_TT_OBJECT union mrb_value_union { #ifndef MRB_WITHOUT_FLOAT diff --git a/include/mruby/value.h b/include/mruby/value.h index ba2738662..d2b85078e 100644 --- a/include/mruby/value.h +++ b/include/mruby/value.h @@ -108,13 +108,13 @@ static const unsigned int IEEE754_INFINITY_BITS_SINGLE = 0x7F800000; enum mrb_vtype { MRB_TT_FALSE = 0, /* 0 */ - MRB_TT_FREE, /* 1 */ - MRB_TT_TRUE, /* 2 */ + MRB_TT_TRUE, /* 1 */ + MRB_TT_FLOAT, /* 2 */ MRB_TT_FIXNUM, /* 3 */ MRB_TT_SYMBOL, /* 4 */ MRB_TT_UNDEF, /* 5 */ - MRB_TT_FLOAT, /* 6 */ - MRB_TT_CPTR, /* 7 */ + MRB_TT_CPTR, /* 6 */ + MRB_TT_FREE, /* 7 */ MRB_TT_OBJECT, /* 8 */ MRB_TT_CLASS, /* 9 */ MRB_TT_MODULE, /* 10 */ @@ -161,6 +161,8 @@ typedef void mrb_value; #include "boxing_no.h" #endif +#define MRB_TT_HAS_BASIC MRB_TT_FREE + #ifndef mrb_immediate_p #define mrb_immediate_p(o) (mrb_type(o) < MRB_TT_HAS_BASIC) #endif -- cgit v1.2.3