hyung-hwan/moo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

put the method modifiers information into the preamble field of the method signature object from interface definition

Browse Source
This commit is contained in:
hyunghwan.chung 2018-10-10 06:12:21 +00:00
parent 653b99545f
commit 2f65380c06
3 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
moo/lib/comp.c
View File

@ -6604,8 +6604,7 @@ static int add_compiled_method (moo_t* moo)
preamble_index = 0; preamble_index = 0;
} }
/*if (cc->mth.variadic) */ preamble_flags |= cc->mth.variadic; /* MOO_METHOD_PREAMBLE_FLAG_VARIADIC or MOO_METHOD_PREAMBLE_FLAG_LIBERAL */
preamble_flags |= cc->mth.variadic;
if (cc->mth.type == MOO_METHOD_DUAL) preamble_flags |= MOO_METHOD_PREAMBLE_FLAG_DUAL; if (cc->mth.type == MOO_METHOD_DUAL) preamble_flags |= MOO_METHOD_PREAMBLE_FLAG_DUAL;
if (cc->mth.lenient) preamble_flags |= MOO_METHOD_PREAMBLE_FLAG_LENIENT; if (cc->mth.lenient) preamble_flags |= MOO_METHOD_PREAMBLE_FLAG_LENIENT;
@ -8126,8 +8125,9 @@ static int add_method_signature (moo_t* moo)
moo_cunit_interface_t* ifce = (moo_cunit_interface_t*)moo->c->cunit; moo_cunit_interface_t* ifce = (moo_cunit_interface_t*)moo->c->cunit;
moo_oop_char_t name; /* selector */ moo_oop_char_t name; /* selector */
moo_oop_methsig_t mth; /* method signature */ moo_oop_methsig_t mth; /* method signature */
moo_ooi_t preamble_flags = 0;
moo_oow_t tmp_count = 0; moo_oow_t tmp_count = 0;
name = (moo_oop_char_t)moo_makesymbol(moo, ifce->mth.name.ptr, ifce->mth.name.len); name = (moo_oop_char_t)moo_makesymbol(moo, ifce->mth.name.ptr, ifce->mth.name.len);
if (!name) goto oops; if (!name) goto oops;
moo_pushtmp (moo, (moo_oop_t*)&name); tmp_count++; moo_pushtmp (moo, (moo_oop_t*)&name); tmp_count++;
@ -8139,12 +8139,11 @@ static int add_method_signature (moo_t* moo)
mth->owner = ifce->self_oop; mth->owner = ifce->self_oop;
mth->name = name; mth->name = name;
/* preamble_flags |= ifce->mth.variadic; /* MOO_METHOD_PREAMBLE_FLAG_VARIADIC or MOO_METHOD_PREAMBLE_FLAG_LIBERAL */
ifce->mth.variadic? if (ifce->mth.lenient) preamble_flags |= MOO_METHOD_PREAMBLE_FLAG_LENIENT;
ifce->mth.lenient? if (ifce->mth.type == MOO_METHOD_DUAL) preamble_flags |= MOO_METHOD_PREAMBLE_FLAG_DUAL;
ifce->meth.type == DUAL? CLASS? INST?
*/ mth->preamble = MOO_SMOOI_TO_OOP(MOO_METHOD_MAKE_PREAMBLE(0,0,preamble_flags));
mth->modifiers = MOO_SMOOI_TO_OOP(0);
mth->tmpr_nargs = MOO_SMOOI_TO_OOP(ifce->mth.tmpr_nargs); mth->tmpr_nargs = MOO_SMOOI_TO_OOP(ifce->mth.tmpr_nargs);
if (ifce->mth.type == MOO_METHOD_DUAL) if (ifce->mth.type == MOO_METHOD_DUAL)

2
moo/lib/moo.c
View File

@ -872,8 +872,6 @@ int moo_genpfmethod (moo_t* moo, moo_mod_t* mod, moo_oop_class_t _class, moo_met
mth->name = mnsym; mth->name = mnsym;
if (variadic) preamble_flags |= MOO_METHOD_PREAMBLE_FLAG_VARIADIC; if (variadic) preamble_flags |= MOO_METHOD_PREAMBLE_FLAG_VARIADIC;
mth->preamble = MOO_SMOOI_TO_OOP(MOO_METHOD_MAKE_PREAMBLE(MOO_METHOD_PREAMBLE_NAMED_PRIMITIVE, 0, preamble_flags)); mth->preamble = MOO_SMOOI_TO_OOP(MOO_METHOD_MAKE_PREAMBLE(MOO_METHOD_PREAMBLE_NAMED_PRIMITIVE, 0, preamble_flags));
/*mth->preamble_data[0] = MOO_SMOOI_TO_OOP(0);
mth->preamble_data[1] = MOO_SMOOI_TO_OOP(0);*/
mth->preamble_data[0] = MOO_SMPTR_TO_OOP(0); mth->preamble_data[0] = MOO_SMPTR_TO_OOP(0);
mth->preamble_data[1] = MOO_SMPTR_TO_OOP(0); mth->preamble_data[1] = MOO_SMPTR_TO_OOP(0);
mth->tmpr_count = MOO_SMOOI_TO_OOP(arg_count); mth->tmpr_count = MOO_SMOOI_TO_OOP(arg_count);

2
moo/lib/moo.h
View File

@ -606,7 +606,7 @@ struct moo_methsig_t
moo_oop_interface_t owner; /* Interface */ moo_oop_interface_t owner; /* Interface */
moo_oop_char_t name; /* Symbol, method name */ moo_oop_char_t name; /* Symbol, method name */
moo_oop_t modifiers; /* SmallInteger, modifiers specified */ moo_oop_t preamble; /* SmallInteger, includes only preamble flags based on modifiers specified */
moo_oop_t tmpr_nargs; /* SmallInteger */ moo_oop_t tmpr_nargs; /* SmallInteger */
}; };