X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=universal.c;h=9e9b2235b6a897cbdaa412d4356156f9798c3535;hb=1aa6ea502f811472fe5fb23153ef6b09b3f470ec;hp=e93a7c19ad8478eb962ce9dc1dc3d975029457c0;hpb=27da23d53ccce622bc51822f59df8def79b4df95;p=p5sagit%2Fp5-mst-13.2.git diff --git a/universal.c b/universal.c index e93a7c1..9e9b223 100644 --- a/universal.c +++ b/universal.c @@ -1,7 +1,7 @@ /* universal.c * * Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, - * 2005, by Larry Wall and others + * 2005, 2006, 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. @@ -35,18 +35,22 @@ STATIC SV * S_isa_lookup(pTHX_ HV *stash, const char *name, HV* name_stash, int len, int level) { + dVAR; AV* av; GV* gv; GV** gvp; - HV* hv = Nullhv; - SV* subgen = Nullsv; + HV* hv = NULL; + SV* subgen = NULL; + const char *hvname; /* A stash/class can go by many names (ie. User == main::User), so we compare the stash itself just in case */ if (name_stash && (stash == name_stash)) return &PL_sv_yes; - if (strEQ(HvNAME(stash), name)) + hvname = HvNAME_get(stash); + + if (strEQ(hvname, name)) return &PL_sv_yes; if (strEQ(name, "UNIVERSAL")) @@ -54,7 +58,7 @@ S_isa_lookup(pTHX_ HV *stash, const char *name, HV* name_stash, if (level > 100) Perl_croak(aTHX_ "Recursive inheritance detected in package '%s'", - HvNAME(stash)); + hvname); gvp = (GV**)hv_fetch(stash, "::ISA::CACHE::", 14, FALSE); @@ -63,16 +67,16 @@ S_isa_lookup(pTHX_ HV *stash, const char *name, HV* name_stash, { if (SvIV(subgen) == (IV)PL_sub_generation) { SV* sv; - SV** svp = (SV**)hv_fetch(hv, name, len, FALSE); + SV** const svp = (SV**)hv_fetch(hv, name, len, FALSE); if (svp && (sv = *svp) != (SV*)&PL_sv_undef) { DEBUG_o( Perl_deb(aTHX_ "Using cached ISA %s for package %s\n", - name, HvNAME(stash)) ); + name, hvname) ); return sv; } } else { DEBUG_o( Perl_deb(aTHX_ "ISA Cache in package %s is stale\n", - HvNAME(stash)) ); + hvname) ); hv_clear(hv); sv_setiv(subgen, PL_sub_generation); } @@ -101,13 +105,13 @@ S_isa_lookup(pTHX_ HV *stash, const char *name, HV* name_stash, /* NOTE: No support for tied ISA */ I32 items = AvFILLp(av) + 1; while (items--) { - SV* sv = *svp++; - HV* basestash = gv_stashsv(sv, FALSE); + SV* const sv = *svp++; + HV* const basestash = gv_stashsv(sv, FALSE); if (!basestash) { if (ckWARN(WARN_MISC)) Perl_warner(aTHX_ packWARN(WARN_SYNTAX), - "Can't locate package %"SVf" for @%s::ISA", - sv, HvNAME(stash)); + "Can't locate package %"SVf" for @%s::ISA", + sv, hvname); continue; } if (&PL_sv_yes == isa_lookup(basestash, name, name_stash, @@ -137,33 +141,30 @@ for class names as well as for objects. bool Perl_sv_derived_from(pTHX_ SV *sv, const char *name) { - const char *type; + dVAR; HV *stash; - HV *name_stash; - - stash = Nullhv; - type = Nullch; - if (SvGMAGICAL(sv)) - mg_get(sv) ; + SvGETMAGIC(sv); if (SvROK(sv)) { + const char *type; sv = SvRV(sv); type = sv_reftype(sv,0); - if (SvOBJECT(sv)) - stash = SvSTASH(sv); + if (type && strEQ(type,name)) + return TRUE; + stash = SvOBJECT(sv) ? SvSTASH(sv) : NULL; } else { stash = gv_stashsv(sv, FALSE); } - name_stash = gv_stashpv(name, FALSE); + if (stash) { + HV * const name_stash = gv_stashpv(name, FALSE); + return isa_lookup(stash, name, name_stash, strlen(name), 0) == &PL_sv_yes; + } + else + return FALSE; - return (type && strEQ(type,name)) || - (stash && isa_lookup(stash, name, name_stash, strlen(name), 0) - == &PL_sv_yes) - ? TRUE - : FALSE ; } #include "XSUB.h" @@ -174,9 +175,14 @@ PERL_XS_EXPORT_C void XS_UNIVERSAL_VERSION(pTHX_ CV *cv); XS(XS_version_new); XS(XS_version_stringify); XS(XS_version_numify); +XS(XS_version_normal); XS(XS_version_vcmp); XS(XS_version_boolean); +#ifdef HASATTRIBUTE_NORETURN +XS(XS_version_noop) __attribute__noreturn__; +#else XS(XS_version_noop); +#endif XS(XS_version_is_alpha); XS(XS_version_qv); XS(XS_utf8_is_utf8); @@ -195,10 +201,12 @@ XS(XS_Regexp_DESTROY); XS(XS_Internals_hash_seed); XS(XS_Internals_rehash_seed); XS(XS_Internals_HvREHASH); +XS(XS_Internals_inc_sub_generation); void Perl_boot_core_UNIVERSAL(pTHX) { + dVAR; const char file[] = __FILE__; newXS("UNIVERSAL::isa", XS_UNIVERSAL_isa, file); @@ -214,6 +222,7 @@ Perl_boot_core_UNIVERSAL(pTHX) newXS("version::stringify", XS_version_stringify, file); newXS("version::(0+", XS_version_numify, file); newXS("version::numify", XS_version_numify, file); + newXS("version::normal", XS_version_normal, file); newXS("version::(cmp", XS_version_vcmp, file); newXS("version::(<=>", XS_version_vcmp, file); newXS("version::vcmp", XS_version_vcmp, file); @@ -242,58 +251,56 @@ Perl_boot_core_UNIVERSAL(pTHX) newXSproto("Internals::hash_seed",XS_Internals_hash_seed, file, ""); newXSproto("Internals::rehash_seed",XS_Internals_rehash_seed, file, ""); newXSproto("Internals::HvREHASH", XS_Internals_HvREHASH, file, "\\%"); + newXSproto("Internals::inc_sub_generation",XS_Internals_inc_sub_generation, + file, ""); } XS(XS_UNIVERSAL_isa) { + dVAR; dXSARGS; - SV *sv; - const char *name; - STRLEN n_a; - (void)cv; if (items != 2) Perl_croak(aTHX_ "Usage: UNIVERSAL::isa(reference, kind)"); + else { + SV * const sv = ST(0); + const char *name; - sv = ST(0); - - if (SvGMAGICAL(sv)) - mg_get(sv); + SvGETMAGIC(sv); - if (!SvOK(sv) || !(SvROK(sv) || (SvPOK(sv) && SvCUR(sv)) - || (SvGMAGICAL(sv) && SvPOKp(sv) && SvCUR(sv)))) - XSRETURN_UNDEF; + if (!SvOK(sv) || !(SvROK(sv) || (SvPOK(sv) && SvCUR(sv)) + || (SvGMAGICAL(sv) && SvPOKp(sv) && SvCUR(sv)))) + XSRETURN_UNDEF; - name = (const char *)SvPV(ST(1),n_a); + name = SvPV_nolen_const(ST(1)); - ST(0) = boolSV(sv_derived_from(sv, name)); - XSRETURN(1); + ST(0) = boolSV(sv_derived_from(sv, name)); + XSRETURN(1); + } } XS(XS_UNIVERSAL_can) { + dVAR; dXSARGS; SV *sv; const char *name; SV *rv; HV *pkg = NULL; - STRLEN n_a; - (void)cv; if (items != 2) Perl_croak(aTHX_ "Usage: UNIVERSAL::can(object-ref, method)"); sv = ST(0); - if (SvGMAGICAL(sv)) - mg_get(sv); + SvGETMAGIC(sv); if (!SvOK(sv) || !(SvROK(sv) || (SvPOK(sv) && SvCUR(sv)) || (SvGMAGICAL(sv) && SvPOKp(sv) && SvCUR(sv)))) XSRETURN_UNDEF; - name = (const char *)SvPV(ST(1),n_a); + name = SvPV_nolen_const(ST(1)); rv = &PL_sv_undef; if (SvROK(sv)) { @@ -306,7 +313,7 @@ XS(XS_UNIVERSAL_can) } if (pkg) { - GV *gv = gv_fetchmethod_autoload(pkg, name, FALSE); + GV * const gv = gv_fetchmethod_autoload(pkg, name, FALSE); if (gv && isGV(gv)) rv = sv_2mortal(newRV((SV*)GvCV(gv))); } @@ -317,13 +324,13 @@ XS(XS_UNIVERSAL_can) XS(XS_UNIVERSAL_VERSION) { + dVAR; dXSARGS; HV *pkg; GV **gvp; GV *gv; SV *sv; const char *undef; - (void)cv; if (SvROK(ST(0))) { sv = (SV*)SvRV(ST(0)); @@ -337,13 +344,13 @@ XS(XS_UNIVERSAL_VERSION) gvp = pkg ? (GV**)hv_fetch(pkg,"VERSION",7,FALSE) : Null(GV**); - if (gvp && isGV(gv = *gvp) && SvOK(sv = GvSV(gv))) { - SV *nsv = sv_newmortal(); + if (gvp && isGV(gv = *gvp) && (sv = GvSV(gv)) && SvOK(sv)) { + SV * const nsv = sv_newmortal(); sv_setsv(nsv, sv); sv = nsv; if ( !sv_derived_from(sv, "version")) upg_version(sv); - undef = Nullch; + undef = NULL; } else { sv = (SV*)&PL_sv_undef; @@ -351,25 +358,24 @@ XS(XS_UNIVERSAL_VERSION) } if (items > 1) { - STRLEN len; SV *req = ST(1); if (undef) { - if (pkg) - Perl_croak(aTHX_ - "%s does not define $%s::VERSION--version check failed", - HvNAME(pkg), HvNAME(pkg)); - else { - const char *str = SvPVx(ST(0), len); - - Perl_croak(aTHX_ - "%s defines neither package nor VERSION--version check failed", str); + if (pkg) { + const char * const name = HvNAME_get(pkg); + Perl_croak(aTHX_ + "%s does not define $%s::VERSION--version check failed", + name, name); + } else { + Perl_croak(aTHX_ + "%s defines neither package nor VERSION--version check failed", + SvPVx_nolen_const(ST(0)) ); } } if ( !sv_derived_from(req, "version")) { /* req may very well be R/O, so create a new object */ - SV *nsv = sv_newmortal(); + SV * const nsv = sv_newmortal(); sv_setsv(nsv, req); req = nsv; upg_version(req); @@ -377,7 +383,7 @@ XS(XS_UNIVERSAL_VERSION) if ( vcmp( req, sv ) > 0 ) Perl_croak(aTHX_ "%s version %"SVf" (%"SVf") required--" - "this is only version %"SVf" (%"SVf")", HvNAME(pkg), + "this is only version %"SVf" (%"SVf")", HvNAME_get(pkg), vnumify(req),vnormal(req),vnumify(sv),vnormal(sv)); } @@ -392,19 +398,34 @@ XS(XS_UNIVERSAL_VERSION) XS(XS_version_new) { + dVAR; dXSARGS; - (void)cv; if (items > 3) Perl_croak(aTHX_ "Usage: version::new(class, version)"); SP -= items; { - const char *classname = SvPV_nolen(ST(0)); SV *vs = ST(1); SV *rv; - if (items == 3 ) - { - vs = sv_newmortal(); - Perl_sv_setpvf(aTHX_ vs,"v%s",SvPV_nolen(ST(2))); + const char * const classname = + sv_isobject(ST(0)) /* get the class if called as an object method */ + ? HvNAME(SvSTASH(SvRV(ST(0)))) + : (char *)SvPV_nolen(ST(0)); + + if ( items == 1 ) { + /* no parameter provided */ + if ( sv_isobject(ST(0)) ) { + /* copy existing object */ + vs = ST(0); + } + else { + /* create empty object */ + vs = sv_newmortal(); + sv_setpvn(vs,"",0); + } + } + else if ( items == 3 ) { + vs = sv_newmortal(); + Perl_sv_setpvf(aTHX_ vs,"v%s",SvPV_nolen_const(ST(2))); } rv = new_version(vs); @@ -419,8 +440,8 @@ XS(XS_version_new) XS(XS_version_stringify) { + dVAR; dXSARGS; - (void)cv; if (items < 1) Perl_croak(aTHX_ "Usage: version::stringify(lobj, ...)"); SP -= items; @@ -428,8 +449,7 @@ XS(XS_version_stringify) SV * lobj; if (sv_derived_from(ST(0), "version")) { - SV *tmp = SvRV(ST(0)); - lobj = tmp; + lobj = SvRV(ST(0)); } else Perl_croak(aTHX_ "lobj is not of type version"); @@ -443,8 +463,8 @@ XS(XS_version_stringify) XS(XS_version_numify) { + dVAR; dXSARGS; - (void)cv; if (items < 1) Perl_croak(aTHX_ "Usage: version::numify(lobj, ...)"); SP -= items; @@ -452,8 +472,7 @@ XS(XS_version_numify) SV * lobj; if (sv_derived_from(ST(0), "version")) { - SV *tmp = SvRV(ST(0)); - lobj = tmp; + lobj = SvRV(ST(0)); } else Perl_croak(aTHX_ "lobj is not of type version"); @@ -465,10 +484,33 @@ XS(XS_version_numify) } } +XS(XS_version_normal) +{ + dVAR; + dXSARGS; + if (items < 1) + Perl_croak(aTHX_ "Usage: version::normal(lobj, ...)"); + SP -= items; + { + SV * lobj; + + if (sv_derived_from(ST(0), "version")) { + lobj = SvRV(ST(0)); + } + else + Perl_croak(aTHX_ "lobj is not of type version"); + + PUSHs(sv_2mortal(vnormal(lobj))); + + PUTBACK; + return; + } +} + XS(XS_version_vcmp) { + dVAR; dXSARGS; - (void)cv; if (items < 1) Perl_croak(aTHX_ "Usage: version::vcmp(lobj, ...)"); SP -= items; @@ -476,8 +518,7 @@ XS(XS_version_vcmp) SV * lobj; if (sv_derived_from(ST(0), "version")) { - SV *tmp = SvRV(ST(0)); - lobj = tmp; + lobj = SvRV(ST(0)); } else Perl_croak(aTHX_ "lobj is not of type version"); @@ -486,7 +527,7 @@ XS(XS_version_vcmp) SV *rs; SV *rvs; SV * robj = ST(1); - IV swap = (IV)SvIV(ST(2)); + const IV swap = (IV)SvIV(ST(2)); if ( ! sv_derived_from(robj, "version") ) { @@ -513,105 +554,74 @@ XS(XS_version_vcmp) XS(XS_version_boolean) { - dXSARGS; - (void)cv; - if (items < 1) - Perl_croak(aTHX_ "Usage: version::boolean(lobj, ...)"); - SP -= items; - { - SV * lobj; - - if (sv_derived_from(ST(0), "version")) { - /* XXX If tmp serves a purpose, explain it. */ - SV *tmp = SvRV(ST(0)); - lobj = tmp; - } - else - Perl_croak(aTHX_ "lobj is not of type version"); - - { - SV *rs; - rs = newSViv( vcmp(lobj,new_version(newSVpvn("0",1))) ); - PUSHs(sv_2mortal(rs)); - } - - PUTBACK; - return; - } + dVAR; + dXSARGS; + if (items < 1) + Perl_croak(aTHX_ "Usage: version::boolean(lobj, ...)"); + SP -= items; + if (sv_derived_from(ST(0), "version")) { + SV * const lobj = SvRV(ST(0)); + SV * const rs = newSViv( vcmp(lobj,new_version(newSVpvs("0"))) ); + PUSHs(sv_2mortal(rs)); + PUTBACK; + return; + } + else + Perl_croak(aTHX_ "lobj is not of type version"); } XS(XS_version_noop) { - dXSARGS; - (void)cv; - if (items < 1) - Perl_croak(aTHX_ "Usage: version::noop(lobj, ...)"); - { - SV * lobj; - - if (sv_derived_from(ST(0), "version")) { - SV *tmp = SvRV(ST(0)); - lobj = tmp; - } - else - Perl_croak(aTHX_ "lobj is not of type version"); - - { - Perl_croak(aTHX_ "operation not supported with version object"); - } - - } - XSRETURN_EMPTY; + dVAR; + dXSARGS; + if (items < 1) + Perl_croak(aTHX_ "Usage: version::noop(lobj, ...)"); + if (sv_derived_from(ST(0), "version")) + Perl_croak(aTHX_ "operation not supported with version object"); + else + Perl_croak(aTHX_ "lobj is not of type version"); +#ifndef HASATTRIBUTE_NORETURN + XSRETURN_EMPTY; +#endif } XS(XS_version_is_alpha) { + dVAR; dXSARGS; - (void)cv; if (items != 1) Perl_croak(aTHX_ "Usage: version::is_alpha(lobj)"); SP -= items; - { - SV *lobj; - - if (sv_derived_from(ST(0), "version")) { - /* XXX If tmp serves a purpose, explain it. */ - SV *tmp = SvRV(ST(0)); - lobj = tmp; - } - else - Perl_croak(aTHX_ "lobj is not of type version"); -{ - const I32 len = av_len((AV *)lobj); - const I32 digit = SvIVX(*av_fetch((AV *)lobj, len, 0)); - if ( digit < 0 ) - XSRETURN_YES; - else - XSRETURN_NO; -} + if (sv_derived_from(ST(0), "version")) { + SV * const lobj = ST(0); + if ( hv_exists((HV*)SvRV(lobj), "alpha", 5 ) ) + XSRETURN_YES; + else + XSRETURN_NO; PUTBACK; return; } + else + Perl_croak(aTHX_ "lobj is not of type version"); } XS(XS_version_qv) { + dVAR; dXSARGS; - (void)cv; if (items != 1) Perl_croak(aTHX_ "Usage: version::qv(ver)"); SP -= items; { SV * ver = ST(0); - if ( !SvVOK(ver) ) /* only need to do with if not already v-string */ - { - SV *vs = sv_newmortal(); + if ( !SvVOK(ver) ) { /* only need to do with if not already v-string */ + SV * const vs = sv_newmortal(); char *version; if ( SvNOK(ver) ) /* may get too much accuracy */ { char tbuf[64]; - sprintf(tbuf,"%.9"NVgf, SvNVX(ver)); - version = savepv(tbuf); + const STRLEN len = my_sprintf(tbuf,"%.9"NVgf, SvNVX(ver)); + version = savepvn(tbuf, len); } else { @@ -634,64 +644,56 @@ XS(XS_version_qv) XS(XS_utf8_is_utf8) { + dVAR; dXSARGS; - (void)cv; if (items != 1) Perl_croak(aTHX_ "Usage: utf8::is_utf8(sv)"); - { - const SV *sv = ST(0); - { - if (SvUTF8(sv)) - XSRETURN_YES; - else - XSRETURN_NO; - } + else { + const SV * const sv = ST(0); + if (SvUTF8(sv)) + XSRETURN_YES; + else + XSRETURN_NO; } XSRETURN_EMPTY; } XS(XS_utf8_valid) { + dVAR; dXSARGS; - (void)cv; if (items != 1) Perl_croak(aTHX_ "Usage: utf8::valid(sv)"); - { - SV * sv = ST(0); - { - STRLEN len; - const char *s = SvPV(sv,len); - if (!SvUTF8(sv) || is_utf8_string((const U8*)s,len)) - XSRETURN_YES; - else - XSRETURN_NO; - } - } + else { + SV * const sv = ST(0); + STRLEN len; + const char * const s = SvPV_const(sv,len); + if (!SvUTF8(sv) || is_utf8_string((const U8*)s,len)) + XSRETURN_YES; + else + XSRETURN_NO; + } XSRETURN_EMPTY; } XS(XS_utf8_encode) { + dVAR; dXSARGS; - (void)cv; if (items != 1) Perl_croak(aTHX_ "Usage: utf8::encode(sv)"); - { - SV * sv = ST(0); - - sv_utf8_encode(sv); - } + sv_utf8_encode(ST(0)); XSRETURN_EMPTY; } XS(XS_utf8_decode) { + dVAR; dXSARGS; - (void)cv; if (items != 1) Perl_croak(aTHX_ "Usage: utf8::decode(sv)"); - { - SV * sv = ST(0); + else { + SV * const sv = ST(0); const bool RETVAL = sv_utf8_decode(sv); ST(0) = boolSV(RETVAL); sv_2mortal(ST(0)); @@ -701,12 +703,12 @@ XS(XS_utf8_decode) XS(XS_utf8_upgrade) { + dVAR; dXSARGS; - (void)cv; if (items != 1) Perl_croak(aTHX_ "Usage: utf8::upgrade(sv)"); - { - SV * sv = ST(0); + else { + SV * const sv = ST(0); STRLEN RETVAL; dXSTARG; @@ -718,12 +720,12 @@ XS(XS_utf8_upgrade) XS(XS_utf8_downgrade) { + dVAR; dXSARGS; - (void)cv; if (items < 1 || items > 2) Perl_croak(aTHX_ "Usage: utf8::downgrade(sv, failok=0)"); - { - SV * sv = ST(0); + else { + SV * const sv = ST(0); const bool failok = (items < 2) ? 0 : (int)SvIV(ST(1)); const bool RETVAL = sv_utf8_downgrade(sv, failok); @@ -735,9 +737,9 @@ XS(XS_utf8_downgrade) XS(XS_utf8_native_to_unicode) { + dVAR; dXSARGS; const UV uv = SvUV(ST(0)); - (void)cv; if (items > 1) Perl_croak(aTHX_ "Usage: utf8::native_to_unicode(sv)"); @@ -748,9 +750,9 @@ XS(XS_utf8_native_to_unicode) XS(XS_utf8_unicode_to_native) { + dVAR; dXSARGS; const UV uv = SvUV(ST(0)); - (void)cv; if (items > 1) Perl_croak(aTHX_ "Usage: utf8::unicode_to_native(sv)"); @@ -761,9 +763,9 @@ XS(XS_utf8_unicode_to_native) XS(XS_Internals_SvREADONLY) /* This is dangerous stuff. */ { + dVAR; dXSARGS; - SV *sv = SvRV(ST(0)); - (void)cv; + SV * const sv = SvRV(ST(0)); if (items == 1) { if (SvREADONLY(sv)) @@ -787,9 +789,9 @@ XS(XS_Internals_SvREADONLY) /* This is dangerous stuff. */ XS(XS_Internals_SvREFCNT) /* This is dangerous stuff. */ { + dVAR; dXSARGS; - SV *sv = SvRV(ST(0)); - (void)cv; + SV * const sv = SvRV(ST(0)); if (items == 1) XSRETURN_IV(SvREFCNT(sv) - 1); /* Minus the ref created for us. */ @@ -803,25 +805,27 @@ XS(XS_Internals_SvREFCNT) /* This is dangerous stuff. */ XS(XS_Internals_hv_clear_placehold) { + dVAR; dXSARGS; - HV *hv = (HV *) SvRV(ST(0)); - (void)cv; if (items != 1) Perl_croak(aTHX_ "Usage: UNIVERSAL::hv_clear_placeholders(hv)"); - hv_clear_placeholders(hv); - XSRETURN(0); + else { + HV * const hv = (HV *) SvRV(ST(0)); + hv_clear_placeholders(hv); + XSRETURN(0); + } } XS(XS_Regexp_DESTROY) { - (void)cv; + PERL_UNUSED_ARG(cv); } XS(XS_PerlIO_get_layers) { + dVAR; dXSARGS; - (void)cv; if (items < 1 || items % 2 == 0) Perl_croak(aTHX_ "Usage: PerlIO_get_layers(filehandle[,args])"); #ifdef USE_PERLIO @@ -833,13 +837,12 @@ XS(XS_PerlIO_get_layers) bool details = FALSE; if (items > 1) { - SV **svp; - + SV * const *svp; for (svp = MARK + 2; svp <= SP; svp += 2) { - SV **varp = svp; - SV **valp = svp + 1; + SV * const * const varp = svp; + SV * const * const valp = svp + 1; STRLEN klen; - const char *key = SvPV(*varp, klen); + const char * const key = SvPV_const(*varp, klen); switch (*key) { case 'i': @@ -877,37 +880,34 @@ XS(XS_PerlIO_get_layers) if (!isGV(sv)) { if (SvROK(sv) && isGV(SvRV(sv))) gv = (GV*)SvRV(sv); - else - gv = gv_fetchsv(sv, FALSE, SVt_PVIO); + else if (SvPOKp(sv)) + gv = gv_fetchsv(sv, 0, SVt_PVIO); } if (gv && (io = GvIO(gv))) { dTARGET; - AV* av = PerlIO_get_layers(aTHX_ input ? + AV* const av = PerlIO_get_layers(aTHX_ input ? IoIFP(io) : IoOFP(io)); I32 i; - I32 last = av_len(av); + const I32 last = av_len(av); I32 nitem = 0; for (i = last; i >= 0; i -= 3) { - SV **namsvp; - SV **argsvp; - SV **flgsvp; - bool namok, argok, flgok; - - namsvp = av_fetch(av, i - 2, FALSE); - argsvp = av_fetch(av, i - 1, FALSE); - flgsvp = av_fetch(av, i, FALSE); + SV * const * const namsvp = av_fetch(av, i - 2, FALSE); + SV * const * const argsvp = av_fetch(av, i - 1, FALSE); + SV * const * const flgsvp = av_fetch(av, i, FALSE); - namok = namsvp && *namsvp && SvPOK(*namsvp); - argok = argsvp && *argsvp && SvPOK(*argsvp); - flgok = flgsvp && *flgsvp && SvIOK(*flgsvp); + const bool namok = namsvp && *namsvp && SvPOK(*namsvp); + const bool argok = argsvp && *argsvp && SvPOK(*argsvp); + const bool flgok = flgsvp && *flgsvp && SvIOK(*flgsvp); if (details) { - XPUSHs(namok ? - newSVpv(SvPVX(*namsvp), 0) : &PL_sv_undef); - XPUSHs(argok ? - newSVpv(SvPVX(*argsvp), 0) : &PL_sv_undef); + XPUSHs(namok + ? newSVpvn(SvPVX_const(*namsvp), SvCUR(*namsvp)) + : &PL_sv_undef); + XPUSHs(argok + ? newSVpvn(SvPVX_const(*argsvp), SvCUR(*argsvp)) + : &PL_sv_undef); if (flgok) XPUSHi(SvIVX(*flgsvp)); else @@ -924,10 +924,10 @@ XS(XS_PerlIO_get_layers) XPUSHs(&PL_sv_undef); nitem++; if (flgok) { - IV flags = SvIVX(*flgsvp); + const IV flags = SvIVX(*flgsvp); if (flags & PERLIO_F_UTF8) { - XPUSHs(newSVpvn("utf8", 4)); + XPUSHs(newSVpvs("utf8")); nitem++; } } @@ -946,28 +946,32 @@ XS(XS_PerlIO_get_layers) XS(XS_Internals_hash_seed) { + dVAR; /* Using dXSARGS would also have dITEM and dSP, * which define 2 unused local variables. */ - dMARK; dAX; - (void)cv; + dAXMARK; + PERL_UNUSED_ARG(cv); + PERL_UNUSED_VAR(mark); XSRETURN_UV(PERL_HASH_SEED); } XS(XS_Internals_rehash_seed) { + dVAR; /* Using dXSARGS would also have dITEM and dSP, * which define 2 unused local variables. */ - dMARK; dAX; - (void)cv; + dAXMARK; + PERL_UNUSED_ARG(cv); + PERL_UNUSED_VAR(mark); XSRETURN_UV(PL_rehash_seed); } XS(XS_Internals_HvREHASH) /* Subject to change */ { + dVAR; dXSARGS; - (void)cv; if (SvROK(ST(0))) { - const HV *hv = (HV *) SvRV(ST(0)); + const HV * const hv = (HV *) SvRV(ST(0)); if (items == 1 && SvTYPE(hv) == SVt_PVHV) { if (HvREHASH(hv)) XSRETURN_YES; @@ -978,6 +982,18 @@ XS(XS_Internals_HvREHASH) /* Subject to change */ Perl_croak(aTHX_ "Internals::HvREHASH $hashref"); } +XS(XS_Internals_inc_sub_generation) +{ + dVAR; + /* Using dXSARGS would also have dITEM and dSP, + * which define 2 unused local variables. */ + dAXMARK; + PERL_UNUSED_ARG(cv); + PERL_UNUSED_VAR(mark); + ++PL_sub_generation; + XSRETURN_EMPTY; +} + /* * Local variables: * c-indentation-style: bsd @@ -985,5 +1001,5 @@ XS(XS_Internals_HvREHASH) /* Subject to change */ * indent-tabs-mode: t * End: * - * vim: shiftwidth=4: -*/ + * ex: set ts=8 sts=4 sw=4 noet: + */