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

revert one of the API changes: MRB_SET_VALUE_P no longer used

Browse Source
This commit is contained in:
Yuichi Nishiwaki
2013-08-04 00:40:41 -07:00
parent 07fefb585e
commit 8854ecb629
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/mruby/value.h
+10 -10
View File
@@ -152,12 +152,14 @@ typedef struct mrb_value {
#define MRB_SET_VALUE(o, tt, attr, v) do {\
(o).value.ttt = mrb_mktt(tt);\
(o).attr = v;\
} while (0)
#define MRB_SET_VALUE_P(o, tt, v) do {\
(o).value.ttt = mrb_mktt(tt);\
(o).value.i = 0;\
(o).value.p = (void*)((uint64_t)(o).value.p | (((uint64_t)(v))>>2));\
switch (tt) {\
case MRB_TT_FALSE:\
case MRB_TT_TRUE:\
case MRB_TT_UNDEF:\
case MRB_TT_FIXNUM:\
case MRB_TT_SYMBOL: (o).attr = (v); break;\
default: (o).value.i = 0; (o).value.p = (void*)((uint64_t)(o).value.p | (((uint64_t)(v))>>2)); break;\
}\
} while (0)
static inline mrb_value
@@ -252,7 +254,6 @@ typedef union mrb_value {
default: if ((o).value.bp) (o).value.bp->tt = ttt; break;\
}\
} while (0)
#define MRB_SET_VALUE_P(o, ttt, v) MRB_SET_VALUE(o, ttt, value.p, v)
extern mrb_value
mrb_float_value(struct mrb_state *mrb, mrb_float f);
@@ -279,7 +280,6 @@ typedef struct mrb_value {
(o).tt = ttt;\
(o).attr = v;\
} while (0)
#define MRB_SET_VALUE_P(o, ttt, v) MRB_SET_VALUE(o, ttt, value.p, v)
static inline mrb_value
mrb_float_value(struct mrb_state *mrb, mrb_float f)
@@ -426,7 +426,7 @@ mrb_obj_value(void *p)
mrb_value v;
struct RBasic *b = (struct RBasic*)p;
MRB_SET_VALUE_P(v, b->tt, p);
MRB_SET_VALUE(v, b->tt, value.p, p);
return v;
}
@@ -439,7 +439,7 @@ mrb_voidp_value(struct mrb_state *mrb, void *p)
{
mrb_value v;
MRB_SET_VALUE_P(v, MRB_TT_VOIDP, p);
MRB_SET_VALUE(v, MRB_TT_VOIDP, value.p, p);
return v;
}
#endif
src/class.c
+1 -1
View File
@@ -1438,7 +1438,7 @@ undef_method(mrb_state *mrb, struct RClass *c, mrb_sym a)
mrb_name_error(mrb, a, "undefined method '%S' for class '%S'", mrb_sym2str(mrb, a), mrb_obj_value(c));
}
else {
MRB_SET_VALUE_P(m, MRB_TT_PROC, 0);
MRB_SET_VALUE(m, MRB_TT_PROC, value.p, 0);
mrb_define_method_vm(mrb, c, a, m);
}
}
src/vm.c
+1 -1
View File
@@ -37,7 +37,7 @@ void abort(void);
#define SET_NIL_VALUE(r) MRB_SET_VALUE(r, MRB_TT_FALSE, value.i, 0)
#define SET_INT_VALUE(r,n) MRB_SET_VALUE(r, MRB_TT_FIXNUM, value.i, (n))
#define SET_SYM_VALUE(r,v) MRB_SET_VALUE(r, MRB_TT_SYMBOL, value.sym, (v))
#define SET_OBJ_VALUE(r,v) MRB_SET_VALUE_P(r, (((struct RObject*)(v))->tt), (v))
#define SET_OBJ_VALUE(r,v) MRB_SET_VALUE(r, (((struct RObject*)(v))->tt), value.p, (v))
#ifdef MRB_NAN_BOXING
#define SET_FLT_VALUE(mrb,r,v) r.f = (v)
#elif defined(MRB_WORD_BOXING)