admin/mruby-mruby
1
0
Fork 0
mirror of https://github.com/mruby/mruby synced 2026-06-08 16:11:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

rename mrb_value_p() to mrb_ptr() since _p means predicate in mruby source

Browse Source
This commit is contained in:
Yukihiro "Matz" Matsumoto
2013-08-07 17:39:28 +09:00
parent 81f1476a04
commit 40e6cdcb5c
11 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/mruby/value.h
+6 -6
View File
@@ -155,7 +155,7 @@ typedef struct mrb_value {
#define mrb_tt(o) (((o).value.ttt & 0xfc000)>>14)
#define mrb_mktt(tt) (0xfff00000|((tt)<<14))
#define mrb_type(o) ((uint32_t)0xfff00000 < (o).value.ttt ? mrb_tt(o) : MRB_TT_FLOAT)
#define mrb_value_p(o) ((void*)((((uint64_t)0x3fffffffffff)&((uint64_t)((o).value.p)))<<2))
#define mrb_ptr(o) ((void*)((((uint64_t)0x3fffffffffff)&((uint64_t)((o).value.p)))<<2))
#define mrb_float(o) (o).f
#define MRB_SET_VALUE(o, tt, attr, v) do {\
@@ -247,7 +247,7 @@ typedef union mrb_value {
unsigned long w;
} mrb_value;
#define mrb_value_p(o) (o).value.p
#define mrb_ptr(o) (o).value.p
#define mrb_float(o) (o).value.fp->f
#define MRB_SET_VALUE(o, ttt, attr, v) do {\
@@ -281,7 +281,7 @@ typedef struct mrb_value {
} mrb_value;
#define mrb_type(o) (o).tt
#define mrb_value_p(o) (o).value.p
#define mrb_ptr(o) (o).value.p
#define mrb_float(o) (o).value.f
#define MRB_SET_VALUE(o, ttt, attr, v) do {\
@@ -311,7 +311,7 @@ mrb_float_value(struct mrb_state *mrb, mrb_float f)
#define mrb_bool(o) ((o).w != MRB_Qnil && (o).w != MRB_Qfalse)
#else
#define mrb_voidp(o) mrb_value_p(o)
#define mrb_voidp(o) mrb_ptr(o)
#define mrb_fixnum_p(o) (mrb_type(o) == MRB_TT_FIXNUM)
#define mrb_undef_p(o) (mrb_type(o) == MRB_TT_UNDEF)
#define mrb_nil_p(o) (mrb_type(o) == MRB_TT_FALSE && !(o).value.i)
@@ -358,7 +358,7 @@ mrb_float_value(struct mrb_state *mrb, mrb_float f)
struct RBasic {
MRB_OBJECT_HEADER;
};
#define mrb_basic_ptr(v) ((struct RBasic*)(mrb_value_p(v)))
#define mrb_basic_ptr(v) ((struct RBasic*)(mrb_ptr(v)))
/* obsolete macro mrb_basic; will be removed soon */
#define mrb_basic(v) mrb_basic_ptr(v)
@@ -366,7 +366,7 @@ struct RObject {
MRB_OBJECT_HEADER;
struct iv_tbl *iv;
};
#define mrb_obj_ptr(v) ((struct RObject*)(mrb_value_p(v)))
#define mrb_obj_ptr(v) ((struct RObject*)(mrb_ptr(v)))
/* obsolete macro mrb_object; will be removed soon */
#define mrb_object(o) mrb_obj_ptr(o)
#define mrb_immediate_p(x) (mrb_type(x) <= MRB_TT_VOIDP)