X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=xsutils.c;h=900ec3fcec73a6a0e8d4c68094b29794429ee918;hb=a5921eb16cb5d703c15b13cc9ddc5fc0fd55de81;hp=49aeeca13d0f506cc6c951c8936ab7d17db66b49;hpb=8cad210e12216ccddc97072654425cc8a94696ff;p=p5sagit%2Fp5-mst-13.2.git diff --git a/xsutils.c b/xsutils.c index 49aeeca..900ec3f 100644 --- a/xsutils.c +++ b/xsutils.c @@ -1,6 +1,6 @@ /* xsutils.c * - * Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, + * Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, * by Larry Wall and others * * You may distribute under the terms of either the GNU General Public @@ -23,12 +23,11 @@ */ /* package attributes; */ -void XS_attributes__warn_reserved(pTHX_ CV *cv); -void XS_attributes_reftype(pTHX_ CV *cv); -void XS_attributes__modify_attrs(pTHX_ CV *cv); -void XS_attributes__guess_stash(pTHX_ CV *cv); -void XS_attributes__fetch_attrs(pTHX_ CV *cv); -void XS_attributes_bootstrap(pTHX_ CV *cv); +PERL_XS_EXPORT_C void XS_attributes_reftype(pTHX_ CV *cv); +PERL_XS_EXPORT_C void XS_attributes__modify_attrs(pTHX_ CV *cv); +PERL_XS_EXPORT_C void XS_attributes__guess_stash(pTHX_ CV *cv); +PERL_XS_EXPORT_C void XS_attributes__fetch_attrs(pTHX_ CV *cv); +PERL_XS_EXPORT_C void XS_attributes_bootstrap(pTHX_ CV *cv); /* @@ -43,11 +42,11 @@ void XS_attributes_bootstrap(pTHX_ CV *cv); * version checks in these bootstrap calls are optional. */ +static const char file[] = __FILE__; + void Perl_boot_core_xsutils(pTHX) { - char *file = __FILE__; - newXS("attributes::bootstrap", XS_attributes_bootstrap, file); } @@ -56,21 +55,23 @@ Perl_boot_core_xsutils(pTHX) static int modify_SV_attributes(pTHX_ SV *sv, SV **retlist, SV **attrlist, int numattrs) { + dVAR; SV *attr; - char *name; - STRLEN len; - bool negated; int nret; for (nret = 0 ; numattrs && (attr = *attrlist++); numattrs--) { - name = SvPV(attr, len); - if ((negated = (*name == '-'))) { + STRLEN len; + const char *name = SvPV_const(attr, len); + const bool negated = (*name == '-'); + + if (negated) { name++; len--; } switch (SvTYPE(sv)) { case SVt_PVCV: switch ((int)len) { +#ifdef CVf_ASSERTION case 9: if (memEQ(name, "assertion", 9)) { if (negated) @@ -80,10 +81,11 @@ modify_SV_attributes(pTHX_ SV *sv, SV **retlist, SV **attrlist, int numattrs) continue; } break; +#endif case 6: switch (name[3]) { - case 'l': #ifdef CVf_LVALUE + case 'l': if (memEQ(name, "lvalue", 6)) { if (negated) CvFLAGS((CV*)sv) &= ~CVf_LVALUE; @@ -92,8 +94,8 @@ modify_SV_attributes(pTHX_ SV *sv, SV **retlist, SV **attrlist, int numattrs) continue; } break; +#endif case 'k': -#endif /* defined CVf_LVALUE */ if (memEQ(name, "locked", 6)) { if (negated) CvFLAGS((CV*)sv) &= ~CVf_LOCKED; @@ -130,10 +132,11 @@ modify_SV_attributes(pTHX_ SV *sv, SV **retlist, SV **attrlist, int numattrs) case 'e': if (memEQ(name, "uniqu", 5)) { if (SvTYPE(sv) == SVt_PVGV) { - if (negated) + if (negated) { GvUNIQUE_off(sv); - else + } else { GvUNIQUE_on(sv); + } } /* Hope this came from toke.c if not a GV. */ continue; @@ -156,13 +159,12 @@ modify_SV_attributes(pTHX_ SV *sv, SV **retlist, SV **attrlist, int numattrs) XS(XS_attributes_bootstrap) { + dVAR; dXSARGS; - char *file = __FILE__; if( items > 1 ) Perl_croak(aTHX_ "Usage: attributes::bootstrap $module"); - newXSproto("attributes::_warn_reserved", XS_attributes__warn_reserved, file, ""); newXS("attributes::_modify_attrs", XS_attributes__modify_attrs, file); newXSproto("attributes::_guess_stash", XS_attributes__guess_stash, file, "$"); newXSproto("attributes::_fetch_attrs", XS_attributes__fetch_attrs, file, "$"); @@ -173,6 +175,7 @@ XS(XS_attributes_bootstrap) XS(XS_attributes__modify_attrs) { + dVAR; dXSARGS; SV *rv, *sv; @@ -194,6 +197,7 @@ usage: XS(XS_attributes__fetch_attrs) { + dVAR; dXSARGS; SV *rv, *sv; cv_flags_t cvflags; @@ -214,21 +218,21 @@ usage: case SVt_PVCV: cvflags = CvFLAGS((CV*)sv); if (cvflags & CVf_LOCKED) - XPUSHs(sv_2mortal(newSVpvn("locked", 6))); + XPUSHs(sv_2mortal(newSVpvs("locked"))); #ifdef CVf_LVALUE if (cvflags & CVf_LVALUE) - XPUSHs(sv_2mortal(newSVpvn("lvalue", 6))); + XPUSHs(sv_2mortal(newSVpvs("lvalue"))); #endif if (cvflags & CVf_METHOD) - XPUSHs(sv_2mortal(newSVpvn("method", 6))); + XPUSHs(sv_2mortal(newSVpvs("method"))); if (GvUNIQUE(CvGV((CV*)sv))) - XPUSHs(sv_2mortal(newSVpvn("unique", 6))); + XPUSHs(sv_2mortal(newSVpvs("unique"))); if (cvflags & CVf_ASSERTION) - XPUSHs(sv_2mortal(newSVpvn("assertion", 9))); + XPUSHs(sv_2mortal(newSVpvs("assertion"))); break; case SVt_PVGV: if (GvUNIQUE(sv)) - XPUSHs(sv_2mortal(newSVpvn("unique", 6))); + XPUSHs(sv_2mortal(newSVpvs("unique"))); break; default: break; @@ -239,6 +243,7 @@ usage: XS(XS_attributes__guess_stash) { + dVAR; dXSARGS; SV *rv, *sv; dXSTARG; @@ -256,13 +261,13 @@ usage: sv = SvRV(rv); if (SvOBJECT(sv)) - sv_setpv(TARG, HvNAME(SvSTASH(sv))); + sv_setpvn(TARG, HvNAME_get(SvSTASH(sv)), HvNAMELEN_get(SvSTASH(sv))); #if 0 /* this was probably a bad idea */ else if (SvPADMY(sv)) sv_setsv(TARG, &PL_sv_no); /* unblessed lexical */ #endif else { - HV *stash = Nullhv; + const HV *stash = NULL; switch (SvTYPE(sv)) { case SVt_PVCV: if (CvGV(sv) && isGV(CvGV(sv)) && GvSTASH(CvGV(sv))) @@ -270,10 +275,6 @@ usage: else if (/* !CvANON(sv) && */ CvSTASH(sv)) stash = CvSTASH(sv); break; - case SVt_PVMG: - if (!(SvFAKE(sv) && SvTIED_mg(sv, PERL_MAGIC_glob))) - break; - /*FALLTHROUGH*/ case SVt_PVGV: if (GvGP(sv) && GvESTASH((GV*)sv)) stash = GvESTASH((GV*)sv); @@ -282,7 +283,7 @@ usage: break; } if (stash) - sv_setpv(TARG, HvNAME(stash)); + sv_setpvn(TARG, HvNAME_get(stash), HvNAMELEN_get(stash)); } SvSETMAGIC(TARG); @@ -291,6 +292,7 @@ usage: XS(XS_attributes_reftype) { + dVAR; dXSARGS; SV *rv, *sv; dXSTARG; @@ -303,8 +305,7 @@ usage: rv = ST(0); ST(0) = TARG; - if (SvGMAGICAL(rv)) - mg_get(rv); + SvGETMAGIC(rv); if (!(SvOK(rv) && SvROK(rv))) goto usage; sv = SvRV(rv); @@ -314,18 +315,12 @@ usage: XSRETURN(1); } -XS(XS_attributes__warn_reserved) -{ - dXSARGS; - - if (items != 0) { - Perl_croak(aTHX_ - "Usage: attributes::_warn_reserved ()"); - } - - EXTEND(SP,1); - ST(0) = boolSV(ckWARN(WARN_RESERVED)); - - XSRETURN(1); -} - +/* + * Local variables: + * c-indentation-style: bsd + * c-basic-offset: 4 + * indent-tabs-mode: t + * End: + * + * ex: set ts=8 sts=4 sw=4 noet: + */