X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=xsutils.c;h=b22a263bbc546c539cc469a5cc86f0cd26f6f956;hb=b22e6366e853f65509e8f0787187381203bd42b7;hp=ea717d96f51940bc92c525383de54d049cbc3e71;hpb=349fd7b7286e5fa0d4cd22565b1943fa16790eac;p=p5sagit%2Fp5-mst-13.2.git diff --git a/xsutils.c b/xsutils.c index ea717d9..b22a263 100644 --- a/xsutils.c +++ b/xsutils.c @@ -1,3 +1,19 @@ +/* xsutils.c + * + * Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 + * by Larry Wall and others + * + * You may distribute under the terms of either the GNU General Public + * License or the Artistic License, as specified in the README file. + * + */ + +/* + * "Perilous to us all are the devices of an art deeper than we possess + * ourselves." --Gandalf + */ + + #include "EXTERN.h" #define PERL_IN_XSUTILS_C #include "perl.h" @@ -7,12 +23,12 @@ */ /* package attributes; */ -void XS_attributes__warn_reserved(pTHXo_ CV *cv); -void XS_attributes_reftype(pTHXo_ CV *cv); -void XS_attributes__modify_attrs(pTHXo_ CV *cv); -void XS_attributes__guess_stash(pTHXo_ CV *cv); -void XS_attributes__fetch_attrs(pTHXo_ CV *cv); -void XS_attributes_bootstrap(pTHXo_ CV *cv); +PERL_XS_EXPORT_C void XS_attributes__warn_reserved(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); /* @@ -23,55 +39,64 @@ void XS_attributes_bootstrap(pTHXo_ CV *cv); * * The various bootstrap definitions can take care of doing * package-specific newXS() calls. Since the layout of the - * bundled lib/*.pm files is in a version-specific directory, + * bundled *.pm files is in a version-specific directory, * version checks in these bootstrap calls are optional. */ void Perl_boot_core_xsutils(pTHX) { - char *file = __FILE__; + const char file[] = __FILE__; newXS("attributes::bootstrap", XS_attributes_bootstrap, file); } -#ifdef PERL_OBJECT -#define NO_XSLOCKS -#endif /* PERL_OBJECT */ - #include "XSUB.h" static int -modify_SV_attributes(pTHXo_ SV *sv, SV **retlist, SV **attrlist, int numattrs) +modify_SV_attributes(pTHX_ SV *sv, SV **retlist, SV **attrlist, int numattrs) { 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) + CvFLAGS((CV*)sv) &= ~CVf_ASSERTION; + else + CvFLAGS((CV*)sv) |= CVf_ASSERTION; + continue; + } + break; +#endif case 6: - switch (*name) { + switch (name[3]) { case 'l': #ifdef CVf_LVALUE - if (strEQ(name, "lvalue")) { + if (memEQ(name, "lvalue", 6)) { if (negated) CvFLAGS((CV*)sv) &= ~CVf_LVALUE; else CvFLAGS((CV*)sv) |= CVf_LVALUE; continue; } + break; + case 'k': #endif /* defined CVf_LVALUE */ - if (strEQ(name, "locked")) { + if (memEQ(name, "locked", 6)) { if (negated) CvFLAGS((CV*)sv) &= ~CVf_LOCKED; else @@ -79,8 +104,8 @@ modify_SV_attributes(pTHXo_ SV *sv, SV **retlist, SV **attrlist, int numattrs) continue; } break; - case 'm': - if (strEQ(name, "method")) { + case 'h': + if (memEQ(name, "method", 6)) { if (negated) CvFLAGS((CV*)sv) &= ~CVf_METHOD; else @@ -93,7 +118,30 @@ modify_SV_attributes(pTHXo_ SV *sv, SV **retlist, SV **attrlist, int numattrs) } break; default: - /* nothing, yet */ + switch ((int)len) { + case 6: + switch (name[5]) { + case 'd': + if (memEQ(name, "share", 5)) { + if (negated) + Perl_croak(aTHX_ "A variable may not be unshared"); + SvSHARE(sv); + continue; + } + break; + case 'e': + if (memEQ(name, "uniqu", 5)) { + if (SvTYPE(sv) == SVt_PVGV) { + if (negated) + GvUNIQUE_off(sv); + else + GvUNIQUE_on(sv); + } + /* Hope this came from toke.c if not a GV. */ + continue; + } + } + } break; } /* anything recognized had a 'continue' above */ @@ -111,7 +159,10 @@ modify_SV_attributes(pTHXo_ SV *sv, SV **retlist, SV **attrlist, int numattrs) XS(XS_attributes_bootstrap) { dXSARGS; - char *file = __FILE__; + const 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); @@ -138,7 +189,7 @@ usage: goto usage; sv = SvRV(rv); if (items > 1) - XSRETURN(modify_SV_attributes(aTHXo_ sv, &ST(0), &ST(1), items-1)); + XSRETURN(modify_SV_attributes(aTHX_ sv, &ST(0), &ST(1), items-1)); XSRETURN(0); } @@ -172,6 +223,14 @@ usage: #endif if (cvflags & CVf_METHOD) XPUSHs(sv_2mortal(newSVpvn("method", 6))); + if (GvUNIQUE(CvGV((CV*)sv))) + XPUSHs(sv_2mortal(newSVpvn("unique", 6))); + if (cvflags & CVf_ASSERTION) + XPUSHs(sv_2mortal(newSVpvn("assertion", 9))); + break; + case SVt_PVGV: + if (GvUNIQUE(sv)) + XPUSHs(sv_2mortal(newSVpvn("unique", 6))); break; default: break; @@ -184,11 +243,7 @@ XS(XS_attributes__guess_stash) { dXSARGS; SV *rv, *sv; -#ifdef dXSTARGET - dXSTARGET; -#else - SV * TARG = sv_newmortal(); -#endif + dXSTARG; if (items != 1) { usage: @@ -203,39 +258,36 @@ 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 = Nullhv; switch (SvTYPE(sv)) { case SVt_PVCV: - if (CvGV(sv) && isGV(CvGV(sv)) && GvSTASH(CvGV(sv)) && - HvNAME(GvSTASH(CvGV(sv)))) + if (CvGV(sv) && isGV(CvGV(sv)) && GvSTASH(CvGV(sv))) stash = GvSTASH(CvGV(sv)); - else if (/* !CvANON(sv) && */ CvSTASH(sv) && HvNAME(CvSTASH(sv))) + else if (/* !CvANON(sv) && */ CvSTASH(sv)) stash = CvSTASH(sv); break; case SVt_PVMG: - if (!(SvFAKE(sv) && SvTIED_mg(sv, '*'))) + if (!(SvFAKE(sv) && SvTIED_mg(sv, PERL_MAGIC_glob))) break; /*FALLTHROUGH*/ case SVt_PVGV: - if (GvGP(sv) && GvESTASH((GV*)sv) && HvNAME(GvESTASH((GV*)sv))) + if (GvGP(sv) && GvESTASH((GV*)sv)) stash = GvESTASH((GV*)sv); break; default: break; } if (stash) - sv_setpv(TARG, HvNAME(stash)); + sv_setpvn(TARG, HvNAME_get(stash), HvNAMELEN_get(stash)); } -#ifdef dXSTARGET SvSETMAGIC(TARG); -#endif XSRETURN(1); } @@ -243,11 +295,7 @@ XS(XS_attributes_reftype) { dXSARGS; SV *rv, *sv; -#ifdef dXSTARGET - dXSTARGET; -#else - SV * TARG = sv_newmortal(); -#endif + dXSTARG; if (items != 1) { usage: @@ -257,17 +305,13 @@ usage: rv = ST(0); ST(0) = TARG; - if (!SvOK(rv)) { - ST(0) = &PL_sv_no; - XSRETURN(1); - } - if (!SvROK(rv)) + if (SvGMAGICAL(rv)) + mg_get(rv); + if (!(SvOK(rv) && SvROK(rv))) goto usage; sv = SvRV(rv); sv_setpv(TARG, sv_reftype(sv, 0)); -#ifdef dXSTARGET SvSETMAGIC(TARG); -#endif XSRETURN(1); } @@ -275,12 +319,6 @@ usage: XS(XS_attributes__warn_reserved) { dXSARGS; - SV *rv, *sv; -#ifdef dXSTARGET - dXSTARGET; -#else - SV * TARG = sv_newmortal(); -#endif if (items != 0) { Perl_croak(aTHX_ @@ -288,12 +326,17 @@ XS(XS_attributes__warn_reserved) } EXTEND(SP,1); - ST(0) = TARG; - sv_setiv(TARG, ckWARN(WARN_RESERVED) != 0); -#ifdef dXSTARGET - SvSETMAGIC(TARG); -#endif + 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: + */