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

More C++ compilability work: mrb_obj_alloc void* conversions

Browse Source 
One of the biggest set of changes needed to make C++ compile, is that you
can't autoconvert "void*" to a different pointer type without a cast (you
can of course, convert pointers *to* "void*"!)

For the first part, convert the users of "mrb_obj_alloc".  Since it has
to return something, make it RBasic* (that's what mrb_obj_alloc() is
operating on anyway).  This way, even in C you'll get a warning if you
don't cast it.

For places where there are a lot of similar calls to mrb_obj_alloc(),
this can be easily hidden through a macro.  I did this in string.c:
    #define mrb_obj_alloc_string(mrb) ((struct RString *) mrb_obj_alloc((mrb), MRB_TT_STRING, (mrb)->string_class))

I also updated the mrb_object() macro to also return a RBasic* -- my
previous commit changed that from "void*" -> "RObject*", but I figure
it should be consistent with mrb_obj_alloc()
This commit is contained in:
Mitchell Blank Jr
2012-05-20 09:43:14 -07:00
parent ec8f97d2a6
commit 9e336b00e5
14 changed files with 42 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/class.c
+9 -9
View File
@@ -108,7 +108,7 @@ make_metaclass(mrb_state *mrb, struct RClass *c)
if (c->c->tt == MRB_TT_SCLASS) {
return;
}
sc = mrb_obj_alloc(mrb, MRB_TT_SCLASS, mrb->class_class);
sc = (struct RClass *) mrb_obj_alloc(mrb, MRB_TT_SCLASS, mrb->class_class);
sc->mt = 0;
if (!c->super) {
sc->super = mrb->class_class;
@@ -500,7 +500,7 @@ boot_defclass(mrb_state *mrb, struct RClass *super)
{
struct RClass *c;
c = mrb_obj_alloc(mrb, MRB_TT_CLASS, mrb->class_class);
c = (struct RClass *) mrb_obj_alloc(mrb, MRB_TT_CLASS, mrb->class_class);
c->super = super ? super : mrb->object_class;
mrb_field_write_barrier(mrb, (struct RBasic*)c, (struct RBasic*)super);
c->mt = kh_init(mt, mrb);
@@ -512,7 +512,7 @@ mrb_include_module(mrb_state *mrb, struct RClass *c, struct RClass *m)
{
struct RClass *ic;
ic = mrb_obj_alloc(mrb, MRB_TT_ICLASS, mrb->class_class);
ic = (struct RClass *) mrb_obj_alloc(mrb, MRB_TT_ICLASS, mrb->class_class);
ic->c = m;
ic->mt = m->mt;
ic->iv = m->iv;
@@ -540,7 +540,7 @@ mrb_singleton_class_ptr(mrb_state *mrb, struct RClass *c)
if (c->tt == MRB_TT_SCLASS) {
return c;
}
sc = mrb_obj_alloc(mrb, MRB_TT_SCLASS, mrb->class_class);
sc = (struct RClass *) mrb_obj_alloc(mrb, MRB_TT_SCLASS, mrb->class_class);
sc->mt = 0;
sc->super = c;
mrb_field_write_barrier(mrb, (struct RBasic*)sc, (struct RBasic*)c);
@@ -563,7 +563,7 @@ mrb_singleton_class(mrb_state *mrb, mrb_value v)
default:
break;
}
obj = (struct RBasic*)mrb_object(v);
obj = mrb_object(v);
obj->c = mrb_singleton_class_ptr(mrb, obj->c);
return mrb_obj_value(obj->c);
}
@@ -668,7 +668,7 @@ mrb_value
mrb_class_new_instance(mrb_state *mrb, int argc, mrb_value *argv, struct RClass * klass)
{
mrb_value obj;
struct RClass * c = mrb_obj_alloc(mrb, klass->tt, klass);
struct RClass * c = (struct RClass *) mrb_obj_alloc(mrb, klass->tt, klass);
c->super = klass;
obj = mrb_obj_value(c);
mrb_obj_call_init(mrb, obj, argc, argv);
@@ -686,7 +686,7 @@ mrb_class_new_instance_m(mrb_state *mrb, mrb_value klass)
mrb_value obj;
mrb_get_args(mrb, "b*", &b, &argv, &argc);
c = mrb_obj_alloc(mrb, k->tt, k);
c = (struct RClass *) mrb_obj_alloc(mrb, k->tt, k);
c->super = k;
obj = mrb_obj_value(c);
mrb_funcall_with_block(mrb, obj, "initialize", argc, argv, b);
@@ -706,7 +706,7 @@ mrb_instance_new(mrb_state *mrb, mrb_value cv)
int argc;
if (ttype == 0) ttype = MRB_TT_OBJECT;
o = mrb_obj_alloc(mrb, ttype, c);
o = (struct RObject *) mrb_obj_alloc(mrb, ttype, c);
obj = mrb_obj_value(o);
mrb_get_args(mrb, "b*", &b, &argv, &argc);
mrb_funcall_with_block(mrb, obj, "initialize", argc, argv, b);
@@ -895,7 +895,7 @@ mrb_class_new(mrb_state *mrb, struct RClass *super)
struct RClass *
mrb_module_new(mrb_state *mrb)
{
struct RClass *m = mrb_obj_alloc(mrb, MRB_TT_MODULE, mrb->module_class);
struct RClass *m = (struct RClass *) mrb_obj_alloc(mrb, MRB_TT_MODULE, mrb->module_class);
return m;
}