Commit b531ae93 authored by Yukihiro "Matz" Matsumoto's avatar Yukihiro "Matz" Matsumoto

Merge pull request #2033 from take-cheeze/mrb_tt_has_basic_p

Add MRB_TT_HAS_BASIC_P macro.
parents c2bc09be 90d74b99
...@@ -298,11 +298,11 @@ int mrb_gc_arena_save(mrb_state*); ...@@ -298,11 +298,11 @@ int mrb_gc_arena_save(mrb_state*);
void mrb_gc_arena_restore(mrb_state*,int); void mrb_gc_arena_restore(mrb_state*,int);
void mrb_gc_mark(mrb_state*,struct RBasic*); void mrb_gc_mark(mrb_state*,struct RBasic*);
#define mrb_gc_mark_value(mrb,val) do {\ #define mrb_gc_mark_value(mrb,val) do {\
if (mrb_type(val) >= MRB_TT_HAS_BASIC) mrb_gc_mark((mrb), mrb_basic_ptr(val));\ if (MRB_TT_HAS_BASIC_P(mrb_type(val))) mrb_gc_mark((mrb), mrb_basic_ptr(val)); \
} while (0) } while (0)
void mrb_field_write_barrier(mrb_state *, struct RBasic*, struct RBasic*); void mrb_field_write_barrier(mrb_state *, struct RBasic*, struct RBasic*);
#define mrb_field_write_barrier_value(mrb, obj, val) do{\ #define mrb_field_write_barrier_value(mrb, obj, val) do{\
if ((val.tt >= MRB_TT_HAS_BASIC)) mrb_field_write_barrier((mrb), (obj), mrb_basic_ptr(val));\ if (MRB_TT_HAS_BASIC_P(val.tt)) mrb_field_write_barrier((mrb), (obj), mrb_basic_ptr(val)); \
} while (0) } while (0)
void mrb_write_barrier(mrb_state *, struct RBasic*); void mrb_write_barrier(mrb_state *, struct RBasic*);
......
...@@ -469,6 +469,8 @@ mrb_cptr_value(struct mrb_state *mrb, void *p) ...@@ -469,6 +469,8 @@ mrb_cptr_value(struct mrb_state *mrb, void *p)
#define mrb_voidp(o) mrb_cptr(o) #define mrb_voidp(o) mrb_cptr(o)
#define mrb_voidp_p(o) mrb_cptr_p(o) #define mrb_voidp_p(o) mrb_cptr_p(o)
#define MRB_TT_HAS_BASIC_P(tt) ((tt) >= MRB_TT_HAS_BASIC)
static inline mrb_value static inline mrb_value
mrb_false_value(void) mrb_false_value(void)
{ {
......
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