X-Git-Url: https://perl5.git.perl.org/perl5.git/blobdiff_plain/6867be6d47d7be8fc56705e4b65f064d3eef92b7..d9e167fc3a2d8fd65ae4ea5f68829988c35acb53:/xsutils.c diff --git a/xsutils.c b/xsutils.c index a8a95e2..3bc1f93 100644 --- a/xsutils.c +++ b/xsutils.c @@ -1,6 +1,6 @@ /* xsutils.c * - * Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 + * Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 * by Larry Wall and others * * You may distribute under the terms of either the GNU General Public @@ -9,8 +9,10 @@ */ /* - * "Perilous to us all are the devices of an art deeper than we possess - * ourselves." --Gandalf + * 'Perilous to us all are the devices of an art deeper than we possess + * ourselves.' --Gandalf + * + * [p.597 of _The Lord of the Rings_, III/xi: "The Palantír"] */ @@ -23,12 +25,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 +44,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) { - const char file[] = __FILE__; - newXS("attributes::bootstrap", XS_attributes_bootstrap, file); } @@ -56,60 +57,50 @@ 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) - CvFLAGS((CV*)sv) &= ~CVf_ASSERTION; - else - CvFLAGS((CV*)sv) |= CVf_ASSERTION; - 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; + CvFLAGS(MUTABLE_CV(sv)) &= ~CVf_LVALUE; else - CvFLAGS((CV*)sv) |= CVf_LVALUE; + CvFLAGS(MUTABLE_CV(sv)) |= CVf_LVALUE; continue; } break; +#endif case 'k': -#endif /* defined CVf_LVALUE */ if (memEQ(name, "locked", 6)) { if (negated) - CvFLAGS((CV*)sv) &= ~CVf_LOCKED; + CvFLAGS(MUTABLE_CV(sv)) &= ~CVf_LOCKED; else - CvFLAGS((CV*)sv) |= CVf_LOCKED; + CvFLAGS(MUTABLE_CV(sv)) |= CVf_LOCKED; continue; } break; case 'h': if (memEQ(name, "method", 6)) { if (negated) - CvFLAGS((CV*)sv) &= ~CVf_METHOD; + CvFLAGS(MUTABLE_CV(sv)) &= ~CVf_METHOD; else - CvFLAGS((CV*)sv) |= CVf_METHOD; + CvFLAGS(MUTABLE_CV(sv)) |= CVf_METHOD; continue; } break; @@ -131,11 +122,12 @@ modify_SV_attributes(pTHX_ SV *sv, SV **retlist, SV **attrlist, int numattrs) break; case 'e': if (memEQ(name, "uniqu", 5)) { - if (SvTYPE(sv) == SVt_PVGV) { - if (negated) + if (isGV_with_GP(sv)) { + if (negated) { GvUNIQUE_off(sv); - else + } else { GvUNIQUE_on(sv); + } } /* Hope this came from toke.c if not a GV. */ continue; @@ -158,14 +150,12 @@ modify_SV_attributes(pTHX_ SV *sv, SV **retlist, SV **attrlist, int numattrs) XS(XS_attributes_bootstrap) { + dVAR; dXSARGS; - const char file[] = __FILE__; - (void)cv; if( items > 1 ) - Perl_croak(aTHX_ "Usage: attributes::bootstrap $module"); + croak_xs_usage(cv, "$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, "$"); @@ -176,14 +166,13 @@ XS(XS_attributes_bootstrap) XS(XS_attributes__modify_attrs) { + dVAR; dXSARGS; SV *rv, *sv; - (void)cv; if (items < 1) { usage: - Perl_croak(aTHX_ - "Usage: attributes::_modify_attrs $reference, @attributes"); + croak_xs_usage(cv, "@attributes"); } rv = ST(0); @@ -198,15 +187,14 @@ usage: XS(XS_attributes__fetch_attrs) { + dVAR; dXSARGS; SV *rv, *sv; cv_flags_t cvflags; - (void)cv; if (items != 1) { usage: - Perl_croak(aTHX_ - "Usage: attributes::_fetch_attrs $reference"); + croak_xs_usage(cv, "$reference"); } rv = ST(0); @@ -217,23 +205,21 @@ usage: switch (SvTYPE(sv)) { case SVt_PVCV: - cvflags = CvFLAGS((CV*)sv); + cvflags = CvFLAGS((const CV *)sv); if (cvflags & CVf_LOCKED) - XPUSHs(sv_2mortal(newSVpvn("locked", 6))); + XPUSHs(newSVpvs_flags("locked", SVs_TEMP)); #ifdef CVf_LVALUE if (cvflags & CVf_LVALUE) - XPUSHs(sv_2mortal(newSVpvn("lvalue", 6))); + XPUSHs(newSVpvs_flags("lvalue", SVs_TEMP)); #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))); + XPUSHs(newSVpvs_flags("method", SVs_TEMP)); + if (GvUNIQUE(CvGV((const CV *)sv))) + XPUSHs(newSVpvs_flags("unique", SVs_TEMP)); break; case SVt_PVGV: - if (GvUNIQUE(sv)) - XPUSHs(sv_2mortal(newSVpvn("unique", 6))); + if (isGV_with_GP(sv) && GvUNIQUE(sv)) + XPUSHs(newSVpvs_flags("unique", SVs_TEMP)); break; default: break; @@ -244,15 +230,14 @@ usage: XS(XS_attributes__guess_stash) { + dVAR; dXSARGS; SV *rv, *sv; dXSTARG; - (void)cv; if (items != 1) { usage: - Perl_croak(aTHX_ - "Usage: attributes::_guess_stash $reference"); + croak_xs_usage(cv, "$reference"); } rv = ST(0); @@ -262,13 +247,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 { - const HV *stash = Nullhv; + const HV *stash = NULL; switch (SvTYPE(sv)) { case SVt_PVCV: if (CvGV(sv) && isGV(CvGV(sv)) && GvSTASH(CvGV(sv))) @@ -276,19 +261,15 @@ 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); + if (isGV_with_GP(sv) && GvGP(sv) && GvESTASH(MUTABLE_GV(sv))) + stash = GvESTASH(MUTABLE_GV(sv)); break; default: break; } if (stash) - sv_setpv(TARG, HvNAME(stash)); + sv_setpvn(TARG, HvNAME_get(stash), HvNAMELEN_get(stash)); } SvSETMAGIC(TARG); @@ -297,21 +278,19 @@ usage: XS(XS_attributes_reftype) { + dVAR; dXSARGS; SV *rv, *sv; dXSTARG; - (void)cv; if (items != 1) { usage: - Perl_croak(aTHX_ - "Usage: attributes::reftype $reference"); + croak_xs_usage(cv, "$reference"); } rv = ST(0); ST(0) = TARG; - if (SvGMAGICAL(rv)) - mg_get(rv); + SvGETMAGIC(rv); if (!(SvOK(rv) && SvROK(rv))) goto usage; sv = SvRV(rv); @@ -321,19 +300,12 @@ usage: XSRETURN(1); } -XS(XS_attributes__warn_reserved) -{ - dXSARGS; - (void)cv; - - 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: + */