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

Remove mrb_obj_ptr(). Use mrb_object() instead.

Browse Source
This commit is contained in:
Masaki Muranaka
2013-03-15 18:12:18 +09:00
parent 0c11a1ca2f
commit bc870ce3f8
3 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/mruby/value.h
-1
View File
@@ -194,7 +194,6 @@ struct RObject {
struct iv_tbl *iv; struct iv_tbl *iv;
}; };
#define mrb_obj_ptr(v) ((struct RObject*)((v).value.p))
#define mrb_immediate_p(x) (mrb_type(x) <= MRB_TT_MAIN) #define mrb_immediate_p(x) (mrb_type(x) <= MRB_TT_MAIN)
#define mrb_special_const_p(x) mrb_immediate_p(x) #define mrb_special_const_p(x) mrb_immediate_p(x)
src/kernel.c
+3 -3
View File
@@ -53,7 +53,7 @@ mrb_value
mrb_obj_inspect(mrb_state *mrb, mrb_value obj) mrb_obj_inspect(mrb_state *mrb, mrb_value obj)
{ {
if ((mrb_type(obj) == MRB_TT_OBJECT) && mrb_obj_basic_to_s_p(mrb, obj)) { if ((mrb_type(obj) == MRB_TT_OBJECT) && mrb_obj_basic_to_s_p(mrb, obj)) {
return mrb_obj_iv_inspect(mrb, mrb_obj_ptr(obj)); return mrb_obj_iv_inspect(mrb, mrb_object(obj));
} }
else if (mrb_type(obj) == MRB_TT_MAIN) { else if (mrb_type(obj) == MRB_TT_MAIN) {
return mrb_str_new(mrb, "main", 4); return mrb_str_new(mrb, "main", 4);
@@ -588,7 +588,7 @@ mrb_obj_ivar_defined(mrb_state *mrb, mrb_value self)
mrb_get_args(mrb, "n", &mid); mrb_get_args(mrb, "n", &mid);
check_iv_name(mrb, mid); check_iv_name(mrb, mid);
if (mrb_obj_iv_defined(mrb, mrb_obj_ptr(self), mid)) if (mrb_obj_iv_defined(mrb, mrb_object(self), mid))
return mrb_true_value(); return mrb_true_value();
return mrb_false_value(); return mrb_false_value();
} }
@@ -929,7 +929,7 @@ mrb_f_raise(mrb_state *mrb, mrb_value self)
/* fall through */ /* fall through */
default: default:
exc = mrb_make_exception(mrb, argc, a); exc = mrb_make_exception(mrb, argc, a);
mrb_obj_iv_set(mrb, mrb_obj_ptr(exc), mrb_intern(mrb, "lastpc"), mrb_voidp_value(mrb->ci->pc)); mrb_obj_iv_set(mrb, mrb_object(exc), mrb_intern(mrb, "lastpc"), mrb_voidp_value(mrb->ci->pc));
mrb_exc_raise(mrb, exc); mrb_exc_raise(mrb, exc);
} }
return mrb_nil_value(); /* not reached */ return mrb_nil_value(); /* not reached */
src/variable.c
+10 -10
View File
@@ -438,7 +438,7 @@ mrb_value
mrb_iv_get(mrb_state *mrb, mrb_value obj, mrb_sym sym) mrb_iv_get(mrb_state *mrb, mrb_value obj, mrb_sym sym)
{ {
if (obj_iv_p(obj)) { if (obj_iv_p(obj)) {
return mrb_obj_iv_get(mrb, mrb_obj_ptr(obj), sym); return mrb_obj_iv_get(mrb, mrb_object(obj), sym);
} }
return mrb_nil_value(); return mrb_nil_value();
} }
@@ -474,7 +474,7 @@ void
mrb_iv_set(mrb_state *mrb, mrb_value obj, mrb_sym sym, mrb_value v) mrb_iv_set(mrb_state *mrb, mrb_value obj, mrb_sym sym, mrb_value v)
{ {
if (obj_iv_p(obj)) { if (obj_iv_p(obj)) {
mrb_obj_iv_set(mrb, mrb_obj_ptr(obj), sym, v); mrb_obj_iv_set(mrb, mrb_object(obj), sym, v);
} }
else { else {
mrb_raise(mrb, E_ARGUMENT_ERROR, "cannot set instance variable"); mrb_raise(mrb, E_ARGUMENT_ERROR, "cannot set instance variable");
@@ -497,14 +497,14 @@ int
mrb_iv_defined(mrb_state *mrb, mrb_value obj, mrb_sym sym) mrb_iv_defined(mrb_state *mrb, mrb_value obj, mrb_sym sym)
{ {
if (!obj_iv_p(obj)) return FALSE; if (!obj_iv_p(obj)) return FALSE;
return mrb_obj_iv_defined(mrb, mrb_obj_ptr(obj), sym); return mrb_obj_iv_defined(mrb, mrb_object(obj), sym);
} }
void void
mrb_iv_copy(mrb_state *mrb, mrb_value dest, mrb_value src) mrb_iv_copy(mrb_state *mrb, mrb_value dest, mrb_value src)
{ {
struct RObject *d = mrb_obj_ptr(dest); struct RObject *d = mrb_object(dest);
struct RObject *s = mrb_obj_ptr(src); struct RObject *s = mrb_object(src);
if (d->iv) { if (d->iv) {
iv_free(mrb, d->iv); iv_free(mrb, d->iv);
@@ -558,7 +558,7 @@ mrb_value
mrb_iv_remove(mrb_state *mrb, mrb_value obj, mrb_sym sym) mrb_iv_remove(mrb_state *mrb, mrb_value obj, mrb_sym sym)
{ {
if (obj_iv_p(obj)) { if (obj_iv_p(obj)) {
iv_tbl *t = mrb_obj_ptr(obj)->iv; iv_tbl *t = mrb_object(obj)->iv;
mrb_value val; mrb_value val;
if (t && iv_del(mrb, t, sym, &val)) { if (t && iv_del(mrb, t, sym, &val)) {
@@ -620,8 +620,8 @@ mrb_obj_instance_variables(mrb_state *mrb, mrb_value self)
mrb_value ary; mrb_value ary;
ary = mrb_ary_new(mrb); ary = mrb_ary_new(mrb);
if (obj_iv_p(self) && mrb_obj_ptr(self)->iv) { if (obj_iv_p(self) && mrb_object(self)->iv) {
iv_foreach(mrb, mrb_obj_ptr(self)->iv, iv_i, &ary); iv_foreach(mrb, mrb_object(self)->iv, iv_i, &ary);
} }
return ary; return ary;
} }
@@ -663,8 +663,8 @@ mrb_mod_class_variables(mrb_state *mrb, mrb_value mod)
mrb_value ary; mrb_value ary;
ary = mrb_ary_new(mrb); ary = mrb_ary_new(mrb);
if (obj_iv_p(mod) && mrb_obj_ptr(mod)->iv) { if (obj_iv_p(mod) && mrb_object(mod)->iv) {
iv_foreach(mrb, mrb_obj_ptr(mod)->iv, cv_i, &ary); iv_foreach(mrb, mrb_object(mod)->iv, cv_i, &ary);
} }
return ary; return ary;
} }