Fix `mrb_immediate_p(MRB_TT_FREE)` to return `false`; ref #4679

parent d48a2190
...@@ -20,7 +20,6 @@ ...@@ -20,7 +20,6 @@
#endif #endif
#define MRB_FIXNUM_SHIFT 0 #define MRB_FIXNUM_SHIFT 0
#define MRB_TT_HAS_BASIC MRB_TT_OBJECT
#ifdef MRB_ENDIAN_BIG #ifdef MRB_ENDIAN_BIG
#define MRB_ENDIAN_LOHI(a,b) a b #define MRB_ENDIAN_LOHI(a,b) a b
......
...@@ -8,7 +8,6 @@ ...@@ -8,7 +8,6 @@
#define MRUBY_BOXING_NO_H #define MRUBY_BOXING_NO_H
#define MRB_FIXNUM_SHIFT 0 #define MRB_FIXNUM_SHIFT 0
#define MRB_TT_HAS_BASIC MRB_TT_OBJECT
union mrb_value_union { union mrb_value_union {
#ifndef MRB_WITHOUT_FLOAT #ifndef MRB_WITHOUT_FLOAT
......
...@@ -108,13 +108,13 @@ static const unsigned int IEEE754_INFINITY_BITS_SINGLE = 0x7F800000; ...@@ -108,13 +108,13 @@ static const unsigned int IEEE754_INFINITY_BITS_SINGLE = 0x7F800000;
enum mrb_vtype { enum mrb_vtype {
MRB_TT_FALSE = 0, /* 0 */ MRB_TT_FALSE = 0, /* 0 */
MRB_TT_FREE, /* 1 */ MRB_TT_TRUE, /* 1 */
MRB_TT_TRUE, /* 2 */ MRB_TT_FLOAT, /* 2 */
MRB_TT_FIXNUM, /* 3 */ MRB_TT_FIXNUM, /* 3 */
MRB_TT_SYMBOL, /* 4 */ MRB_TT_SYMBOL, /* 4 */
MRB_TT_UNDEF, /* 5 */ MRB_TT_UNDEF, /* 5 */
MRB_TT_FLOAT, /* 6 */ MRB_TT_CPTR, /* 6 */
MRB_TT_CPTR, /* 7 */ MRB_TT_FREE, /* 7 */
MRB_TT_OBJECT, /* 8 */ MRB_TT_OBJECT, /* 8 */
MRB_TT_CLASS, /* 9 */ MRB_TT_CLASS, /* 9 */
MRB_TT_MODULE, /* 10 */ MRB_TT_MODULE, /* 10 */
...@@ -161,6 +161,8 @@ typedef void mrb_value; ...@@ -161,6 +161,8 @@ typedef void mrb_value;
#include "boxing_no.h" #include "boxing_no.h"
#endif #endif
#define MRB_TT_HAS_BASIC MRB_TT_FREE
#ifndef mrb_immediate_p #ifndef mrb_immediate_p
#define mrb_immediate_p(o) (mrb_type(o) < MRB_TT_HAS_BASIC) #define mrb_immediate_p(o) (mrb_type(o) < MRB_TT_HAS_BASIC)
#endif #endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment