X-Git-Url: https://perl5.git.perl.org/perl5.git/blobdiff_plain/58c0efa57789d77088d564834046e633a5c42edc..eba1666137b7e1350d666a934a5e99ced3f50088:/universal.c diff --git a/universal.c b/universal.c index 4cbda94..fa0ccd3 100644 --- a/universal.c +++ b/universal.c @@ -16,6 +16,11 @@ /* This file contains the code that implements the functions in Perl's * UNIVERSAL package, such as UNIVERSAL->can(). + * + * It is also used to store XS functions that need to be present in + * miniperl for a lack of a better place to put them. It might be + * clever to move them to seperate XS files which would then be pulled + * in by some to-be-written build process. */ #include "EXTERN.h" @@ -32,16 +37,13 @@ */ STATIC bool -S_isa_lookup(pTHX_ HV *stash, const char *name, const HV* const name_stash, - int len, int level) +S_isa_lookup(pTHX_ HV *stash, const char * const name, const HV* const name_stash) { dVAR; - AV* av; - GV* gv; - GV** gvp; - HV* hv = NULL; - SV* subgen = NULL; + AV* stash_linear_isa; + SV** svp; const char *hvname; + I32 items; /* A stash/class can go by many names (ie. User == main::User), so we compare the stash itself just in case */ @@ -56,75 +58,23 @@ S_isa_lookup(pTHX_ HV *stash, const char *name, const HV* const name_stash, if (strEQ(name, "UNIVERSAL")) return TRUE; - if (level > 100) - Perl_croak(aTHX_ "Recursive inheritance detected in package '%s'", - hvname); - - gvp = (GV**)hv_fetchs(stash, "::ISA::CACHE::", FALSE); - - if (gvp && (gv = *gvp) && isGV_with_GP(gv) && (subgen = GvSV(gv)) - && (hv = GvHV(gv))) - { - if (SvIV(subgen) == (IV)PL_sub_generation) { - SV** const svp = (SV**)hv_fetch(hv, name, len, FALSE); - if (svp) { - SV * const sv = *svp; -#ifdef DEBUGGING - if (sv != &PL_sv_undef) - DEBUG_o( Perl_deb(aTHX_ "Using cached ISA %s for package %s\n", - name, hvname) ); -#endif - return (sv == &PL_sv_yes); - } - } - else { - DEBUG_o( Perl_deb(aTHX_ "ISA Cache in package %s is stale\n", - hvname) ); - hv_clear(hv); - sv_setiv(subgen, PL_sub_generation); + stash_linear_isa = mro_get_linear_isa(stash); + svp = AvARRAY(stash_linear_isa) + 1; + items = AvFILLp(stash_linear_isa); + while (items--) { + SV* const basename_sv = *svp++; + HV* const basestash = gv_stashsv(basename_sv, 0); + if (!basestash) { + if (ckWARN(WARN_SYNTAX)) + Perl_warner(aTHX_ packWARN(WARN_SYNTAX), + "Can't locate package %"SVf" for the parents of %s", + SVfARG(basename_sv), hvname); + continue; } + if(name_stash == basestash || strEQ(name, SvPVX(basename_sv))) + return TRUE; } - gvp = (GV**)hv_fetchs(stash, "ISA", FALSE); - - if (gvp && (gv = *gvp) && isGV_with_GP(gv) && (av = GvAV(gv))) { - if (!hv || !subgen) { - gvp = (GV**)hv_fetchs(stash, "::ISA::CACHE::", TRUE); - - gv = *gvp; - - if (SvTYPE(gv) != SVt_PVGV) - gv_init(gv, stash, "::ISA::CACHE::", 14, TRUE); - - if (!hv) - hv = GvHVn(gv); - if (!subgen) { - subgen = newSViv(PL_sub_generation); - GvSV(gv) = subgen; - } - } - if (hv) { - SV** svp = AvARRAY(av); - /* NOTE: No support for tied ISA */ - I32 items = AvFILLp(av) + 1; - while (items--) { - SV* const sv = *svp++; - HV* const basestash = gv_stashsv(sv, 0); - if (!basestash) { - if (ckWARN(WARN_MISC)) - Perl_warner(aTHX_ packWARN(WARN_SYNTAX), - "Can't locate package %"SVf" for @%s::ISA", - SVfARG(sv), hvname); - continue; - } - if (isa_lookup(basestash, name, name_stash, len, level + 1)) { - (void)hv_store(hv,name,len,&PL_sv_yes,0); - return TRUE; - } - } - (void)hv_store(hv,name,len,&PL_sv_no,0); - } - } return FALSE; } @@ -162,7 +112,7 @@ Perl_sv_derived_from(pTHX_ SV *sv, const char *name) if (stash) { HV * const name_stash = gv_stashpv(name, 0); - return isa_lookup(stash, name, name_stash, strlen(name), 0); + return isa_lookup(stash, name, name_stash); } else return FALSE; @@ -185,6 +135,7 @@ Perl_sv_does(pTHX_ SV *sv, const char *name) { const char *classname; bool does_it; + SV *methodname; dSP; ENTER; @@ -199,7 +150,7 @@ Perl_sv_does(pTHX_ SV *sv, const char *name) if (sv_isobject(sv)) { classname = sv_reftype(SvRV(sv),TRUE); } else { - classname = SvPV(sv,PL_na); + classname = SvPV_nolen(sv); } if (strEQ(name,classname)) @@ -210,7 +161,12 @@ Perl_sv_does(pTHX_ SV *sv, const char *name) XPUSHs(sv_2mortal(newSVpv(name, 0))); PUTBACK; - call_method("isa", G_SCALAR); + methodname = sv_2mortal(newSVpvs("isa")); + /* ugly hack: use the SvSCREAM flag so S_method_common + * can figure out we're calling DOES() and not isa(), + * and report eventual errors correctly. --rgs */ + SvSCREAM_on(methodname); + call_sv(methodname, G_SCALAR | G_METHOD); SPAGAIN; does_it = SvTRUE( TOPs ); @@ -254,6 +210,19 @@ XS(XS_Internals_hash_seed); XS(XS_Internals_rehash_seed); XS(XS_Internals_HvREHASH); XS(XS_Internals_inc_sub_generation); +XS(XS_re_is_regexp); +XS(XS_re_regname); +XS(XS_re_regnames); +XS(XS_re_regnames_count); +XS(XS_Tie_Hash_NamedCapture_FETCH); +XS(XS_Tie_Hash_NamedCapture_STORE); +XS(XS_Tie_Hash_NamedCapture_DELETE); +XS(XS_Tie_Hash_NamedCapture_CLEAR); +XS(XS_Tie_Hash_NamedCapture_EXISTS); +XS(XS_Tie_Hash_NamedCapture_FIRSTK); +XS(XS_Tie_Hash_NamedCapture_NEXTK); +XS(XS_Tie_Hash_NamedCapture_SCALAR); +XS(XS_Tie_Hash_NamedCapture_flags); void Perl_boot_core_UNIVERSAL(pTHX) @@ -304,8 +273,19 @@ 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, ""); + newXSproto("re::is_regexp", XS_re_is_regexp, file, "$"); + newXSproto("re::regname", XS_re_regname, file, ";$$"); + newXSproto("re::regnames", XS_re_regnames, file, ";$"); + newXSproto("re::regnames_count", XS_re_regnames_count, file, ""); + newXS("Tie::Hash::NamedCapture::FETCH", XS_Tie_Hash_NamedCapture_FETCH, file); + newXS("Tie::Hash::NamedCapture::STORE", XS_Tie_Hash_NamedCapture_STORE, file); + newXS("Tie::Hash::NamedCapture::DELETE", XS_Tie_Hash_NamedCapture_DELETE, file); + newXS("Tie::Hash::NamedCapture::CLEAR", XS_Tie_Hash_NamedCapture_CLEAR, file); + newXS("Tie::Hash::NamedCapture::EXISTS", XS_Tie_Hash_NamedCapture_EXISTS, file); + newXS("Tie::Hash::NamedCapture::FIRSTKEY", XS_Tie_Hash_NamedCapture_FIRSTK, file); + newXS("Tie::Hash::NamedCapture::NEXTKEY", XS_Tie_Hash_NamedCapture_NEXTK, file); + newXS("Tie::Hash::NamedCapture::SCALAR", XS_Tie_Hash_NamedCapture_SCALAR, file); + newXS("Tie::Hash::NamedCapture::flags", XS_Tie_Hash_NamedCapture_flags, file); } @@ -384,7 +364,7 @@ XS(XS_UNIVERSAL_DOES) PERL_UNUSED_ARG(cv); if (items != 2) - Perl_croak(aTHX_ "Usage: invocant->does(kind)"); + Perl_croak(aTHX_ "Usage: invocant->DOES(kind)"); else { SV * const sv = ST(0); const char *name; @@ -425,7 +405,7 @@ XS(XS_UNIVERSAL_VERSION) sv_setsv(nsv, sv); sv = nsv; if ( !sv_derived_from(sv, "version")) - upg_version(sv); + upg_version(sv, FALSE); undef = NULL; } else { @@ -451,23 +431,27 @@ XS(XS_UNIVERSAL_VERSION) if ( !sv_derived_from(req, "version")) { /* req may very well be R/O, so create a new object */ - SV * const nsv = sv_newmortal(); - sv_setsv(nsv, req); - req = nsv; - upg_version(req); + req = sv_2mortal( new_version(req) ); } - if ( vcmp( req, sv ) > 0 ) - Perl_croak(aTHX_ "%s version %"SVf" (%"SVf") required--" - "this is only version %"SVf" (%"SVf")", HvNAME_get(pkg), - SVfARG(vnumify(req)), + if ( vcmp( req, sv ) > 0 ) { + if ( hv_exists((HV*)SvRV(req), "qv", 2 ) ) { + Perl_croak(aTHX_ "%s version %"SVf" required--" + "this is only version %"SVf"", HvNAME_get(pkg), SVfARG(vnormal(req)), - SVfARG(vnumify(sv)), SVfARG(vnormal(sv))); + } else { + Perl_croak(aTHX_ "%s version %"SVf" required--" + "this is only version %"SVf"", HvNAME_get(pkg), + SVfARG(vstringify(req)), + SVfARG(vstringify(sv))); + } + } + } if ( SvOK(sv) && sv_derived_from(sv, "version") ) { - ST(0) = vnumify(sv); + ST(0) = vstringify(sv); } else { ST(0) = sv; } @@ -696,29 +680,10 @@ XS(XS_version_qv) { SV * ver = ST(0); 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]; -#ifdef USE_LOCALE_NUMERIC - char *loc = setlocale(LC_NUMERIC, "C"); -#endif - STRLEN len = my_snprintf(tbuf, sizeof(tbuf), "%.9"NVgf, SvNVX(ver)); -#ifdef USE_LOCALE_NUMERIC - setlocale(LC_NUMERIC, loc); -#endif - while (tbuf[len-1] == '0' && len > 0) len--; - version = savepvn(tbuf, len); - } - else - { - version = savesvpv(ver); - } - (void)scan_version(version,vs,TRUE); - Safefree(version); - - PUSHs(vs); + SV * const rv = sv_newmortal(); + sv_setsv(rv,ver); /* make a duplicate */ + upg_version(rv, TRUE); + PUSHs(rv); } else { @@ -1086,18 +1051,389 @@ XS(XS_Internals_HvREHASH) /* Subject to change */ Perl_croak(aTHX_ "Internals::HvREHASH $hashref"); } -XS(XS_Internals_inc_sub_generation) +XS(XS_re_is_regexp) +{ + dVAR; + dXSARGS; + PERL_UNUSED_VAR(cv); + + if (items != 1) + Perl_croak(aTHX_ "Usage: %s(%s)", "re::is_regexp", "sv"); + + SP -= items; + + if (SvRXOK(ST(0))) { + XSRETURN_YES; + } else { + XSRETURN_NO; + } +} + +XS(XS_re_regnames_count) +{ + REGEXP *rx = PL_curpm ? PM_GETRE(PL_curpm) : NULL; + SV * ret; + dVAR; + dXSARGS; + PERL_UNUSED_ARG(cv); + + if (items != 0) + Perl_croak(aTHX_ "Usage: %s(%s)", "re::regnames_count", ""); + + SP -= items; + + if (!rx) + XSRETURN_UNDEF; + + ret = CALLREG_NAMED_BUFF_COUNT(rx); + + SPAGAIN; + + if (ret) { + XPUSHs(ret); + PUTBACK; + return; + } else { + XSRETURN_UNDEF; + } +} + +XS(XS_re_regname) { dVAR; - /* Using dXSARGS would also have dITEM and dSP, - * which define 2 unused local variables. */ - dAXMARK; + dXSARGS; + REGEXP * rx; + U32 flags; + SV * ret; PERL_UNUSED_ARG(cv); - PERL_UNUSED_VAR(mark); - ++PL_sub_generation; - XSRETURN_EMPTY; + + if (items < 1 || items > 2) + Perl_croak(aTHX_ "Usage: %s(%s)", "re::regname", "name[, all ]"); + + SP -= items; + + rx = PL_curpm ? PM_GETRE(PL_curpm) : NULL; + + if (!rx) + XSRETURN_UNDEF; + + if (items == 2 && SvTRUE(ST(1))) { + flags = RXapif_ALL; + } else { + flags = RXapif_ONE; + } + ret = CALLREG_NAMED_BUFF_FETCH(rx, ST(0), (flags | RXapif_REGNAME)); + + if (ret) { + if (SvROK(ret)) + XPUSHs(ret); + else + XPUSHs(SvREFCNT_inc(ret)); + XSRETURN(1); + } + XSRETURN_UNDEF; } + +XS(XS_re_regnames) +{ + dVAR; + dXSARGS; + REGEXP * rx; + U32 flags; + SV *ret; + AV *av; + I32 length; + I32 i; + SV **entry; + PERL_UNUSED_ARG(cv); + + if (items > 1) + Perl_croak(aTHX_ "Usage: %s(%s)", "re::regnames", "[all]"); + + rx = PL_curpm ? PM_GETRE(PL_curpm) : NULL; + + if (!rx) + XSRETURN_UNDEF; + + if (items == 1 && SvTRUE(ST(0))) { + flags = RXapif_ALL; + } else { + flags = RXapif_ONE; + } + + SP -= items; + + ret = CALLREG_NAMED_BUFF_ALL(rx, (flags | RXapif_REGNAMES)); + + SPAGAIN; + + SP -= items; + + if (!ret) + XSRETURN_UNDEF; + + av = (AV*)SvRV(ret); + length = av_len(av); + + for (i = 0; i <= length; i++) { + entry = av_fetch(av, i, FALSE); + + if (!entry) + Perl_croak(aTHX_ "NULL array element in re::regnames()"); + + XPUSHs(*entry); + } + PUTBACK; + return; +} + +XS(XS_Tie_Hash_NamedCapture_FETCH) +{ + dVAR; + dXSARGS; + REGEXP * rx; + U32 flags; + SV * ret; + PERL_UNUSED_ARG(cv); + + if (items != 2) + Perl_croak(aTHX_ "Usage: Tie::Hash::NamedCapture::STORE($key, $flags)"); + + rx = PL_curpm ? PM_GETRE(PL_curpm) : NULL; + + if (!rx) + XSRETURN_UNDEF; + + SP -= items; + + flags = (U32)INT2PTR(IV,SvIV(SvRV((SV*)ST(0)))); + ret = CALLREG_NAMED_BUFF_FETCH(rx, ST(1), flags); + + SPAGAIN; + + if (ret) { + if (SvROK(ret)) + XPUSHs(ret); + else + XPUSHs(SvREFCNT_inc(ret)); + PUTBACK; + return; + } + XSRETURN_UNDEF; +} + +XS(XS_Tie_Hash_NamedCapture_STORE) +{ + dVAR; + dXSARGS; + REGEXP * rx; + U32 flags; + PERL_UNUSED_ARG(cv); + + if (items != 3) + Perl_croak(aTHX_ "Usage: Tie::Hash::NamedCapture::STORE($key, $value, $flags)"); + + rx = PL_curpm ? PM_GETRE(PL_curpm) : NULL; + + if (!rx) { + if (!PL_localizing) + Perl_croak(aTHX_ PL_no_modify); + else + XSRETURN_UNDEF; + } + + SP -= items; + + flags = (U32)INT2PTR(IV,SvIV(SvRV((SV*)ST(0)))); + CALLREG_NAMED_BUFF_STORE(rx,ST(1), ST(2), flags); +} + +XS(XS_Tie_Hash_NamedCapture_DELETE) +{ + dVAR; + dXSARGS; + REGEXP * rx = PL_curpm ? PM_GETRE(PL_curpm) : NULL; + U32 flags; + PERL_UNUSED_ARG(cv); + + if (items != 2) + Perl_croak(aTHX_ "Usage: Tie::Hash::NamedCapture::DELETE($key, $flags)"); + + if (!rx) + Perl_croak(aTHX_ PL_no_modify); + + SP -= items; + + flags = (U32)INT2PTR(IV,SvIV(SvRV((SV*)ST(0)))); + CALLREG_NAMED_BUFF_DELETE(rx, ST(1), flags); +} + +XS(XS_Tie_Hash_NamedCapture_CLEAR) +{ + dVAR; + dXSARGS; + REGEXP * rx; + U32 flags; + PERL_UNUSED_ARG(cv); + + if (items != 1) + Perl_croak(aTHX_ "Usage: Tie::Hash::NamedCapture::CLEAR($flags)"); + + rx = PL_curpm ? PM_GETRE(PL_curpm) : NULL; + + if (!rx) + Perl_croak(aTHX_ PL_no_modify); + + SP -= items; + + flags = (U32)INT2PTR(IV,SvIV(SvRV((SV*)ST(0)))); + CALLREG_NAMED_BUFF_CLEAR(rx, flags); +} + +XS(XS_Tie_Hash_NamedCapture_EXISTS) +{ + dVAR; + dXSARGS; + REGEXP * rx; + U32 flags; + SV * ret; + PERL_UNUSED_ARG(cv); + + if (items != 2) + Perl_croak(aTHX_ "Usage: Tie::Hash::NamedCapture::EXISTS($key, $flags)"); + + rx = PL_curpm ? PM_GETRE(PL_curpm) : NULL; + + if (!rx) + XSRETURN_UNDEF; + + SP -= items; + + flags = (U32)INT2PTR(IV,SvIV(SvRV((SV*)ST(0)))); + ret = CALLREG_NAMED_BUFF_EXISTS(rx, ST(1), flags); + + SPAGAIN; + + XPUSHs(ret); + PUTBACK; + return; +} + +XS(XS_Tie_Hash_NamedCapture_FIRSTK) +{ + dVAR; + dXSARGS; + REGEXP * rx; + U32 flags; + SV * ret; + PERL_UNUSED_ARG(cv); + + if (items != 1) + Perl_croak(aTHX_ "Usage: Tie::Hash::NamedCapture::FIRSTKEY()"); + + rx = PL_curpm ? PM_GETRE(PL_curpm) : NULL; + + if (!rx) + XSRETURN_UNDEF; + + SP -= items; + + flags = (U32)INT2PTR(IV,SvIV(SvRV((SV*)ST(0)))); + ret = CALLREG_NAMED_BUFF_FIRSTKEY(rx, flags); + + SPAGAIN; + + if (ret) { + XPUSHs(SvREFCNT_inc(ret)); + PUTBACK; + } else { + XSRETURN_UNDEF; + } + +} + +XS(XS_Tie_Hash_NamedCapture_NEXTK) +{ + dVAR; + dXSARGS; + REGEXP * rx; + U32 flags; + SV * ret; + PERL_UNUSED_ARG(cv); + + if (items != 2) + Perl_croak(aTHX_ "Usage: Tie::Hash::NamedCapture::NEXTKEY($lastkey)"); + + rx = PL_curpm ? PM_GETRE(PL_curpm) : NULL; + + if (!rx) + XSRETURN_UNDEF; + + SP -= items; + + flags = (U32)INT2PTR(IV,SvIV(SvRV((SV*)ST(0)))); + ret = CALLREG_NAMED_BUFF_NEXTKEY(rx, ST(1), flags); + + SPAGAIN; + + if (ret) { + XPUSHs(ret); + } else { + XSRETURN_UNDEF; + } + PUTBACK; +} + +XS(XS_Tie_Hash_NamedCapture_SCALAR) +{ + dVAR; + dXSARGS; + REGEXP * rx; + U32 flags; + SV * ret; + PERL_UNUSED_ARG(cv); + + if (items != 1) + Perl_croak(aTHX_ "Usage: Tie::Hash::NamedCapture::SCALAR()"); + + rx = PL_curpm ? PM_GETRE(PL_curpm) : NULL; + + if (!rx) + XSRETURN_UNDEF; + + SP -= items; + + flags = (U32)INT2PTR(IV,SvIV(SvRV((SV*)ST(0)))); + ret = CALLREG_NAMED_BUFF_SCALAR(rx, flags); + + SPAGAIN; + + if (ret) { + XPUSHs(ret); + PUTBACK; + return; + } else { + XSRETURN_UNDEF; + } +} + +XS(XS_Tie_Hash_NamedCapture_flags) +{ + dVAR; + dXSARGS; + PERL_UNUSED_ARG(cv); + + if (items != 0) + Perl_croak(aTHX_ "Usage: Tie::Hash::NamedCapture::flags()"); + + XPUSHs(sv_2mortal(newSVuv(RXapif_ONE))); + XPUSHs(sv_2mortal(newSVuv(RXapif_ALL))); + PUTBACK; + return; +} + + /* * Local variables: * c-indentation-style: bsd