X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=xs-src%2FMouseUtil.xs;h=93160fc13677103482531569328ba5579fcf04b8;hb=f178e757b3b0e7920ad90efb2628f2e648ffcd37;hp=e437c17333623dae3138bef52a4d89e53fd7f7f2;hpb=fd16872522eea1e9d9c77c8e822c89721ce8cb06;p=gitmo%2FMouse.git diff --git a/xs-src/MouseUtil.xs b/xs-src/MouseUtil.xs index e437c17..93160fc 100644 --- a/xs-src/MouseUtil.xs +++ b/xs-src/MouseUtil.xs @@ -215,7 +215,7 @@ mouse_get_metaclass(pTHX_ SV* metaclass_name){ assert(MY_CXT.metas); if(IsObject(metaclass_name)){ - HV* const stash = SvSTASH(metaclass_name); + HV* const stash = SvSTASH(SvRV(metaclass_name)); metaclass_name = newSVpvn_share(HvNAME_get(stash), HvNAMELEN_get(stash), 0U); sv_2mortal(metaclass_name); @@ -347,27 +347,35 @@ OUTPUT: RETVAL void -generate_isa_predicate_for(SV* klass, SV* predicate_name = NULL) +generate_isa_predicate_for(SV* arg, SV* predicate_name = NULL) +ALIAS: + generate_isa_predicate_for = 0 + generate_can_predicate_for = 1 PPCODE: { const char* name_pv = NULL; CV* xsub; - SvGETMAGIC(klass); + SvGETMAGIC(arg); - if(!SvOK(klass)){ - croak("You must define a class name"); + if(!SvOK(arg)){ + croak("You must define %s", ix == 0 ? "a class name" : "method names"); } if(predicate_name){ SvGETMAGIC(predicate_name); if(!SvOK(predicate_name)){ - croak("You must define a predicate_name"); + croak("You must define %s", "a predicate name"); } name_pv = SvPV_nolen_const(predicate_name); } - xsub = mouse_generate_isa_predicate_for(aTHX_ klass, name_pv); + if(ix == 0){ + xsub = mouse_generate_isa_predicate_for(aTHX_ arg, name_pv); + } + else{ + xsub = mouse_generate_can_predicate_for(aTHX_ arg, name_pv); + } if(predicate_name == NULL){ /* anonymous predicate */ XPUSHs( newRV_noinc((SV*)xsub) );