X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=universal.c;h=b92bd7a5680ccdf729d555bfc260b2890d075054;hb=30ef33217aeee51ee47b2433e9384b011646254a;hp=75e6c5eae43f32a062a878100ce7b25e33946441;hpb=f6eb1a9681f0cdb7a59526670d656e4adf00188c;p=p5sagit%2Fp5-mst-13.2.git diff --git a/universal.c b/universal.c index 75e6c5e..b92bd7a 100644 --- a/universal.c +++ b/universal.c @@ -1,3 +1,18 @@ +/* universal.c + * + * Copyright (c) 1997-2002, Larry Wall + * + * You may distribute under the terms of either the GNU General Public + * License or the Artistic License, as specified in the README file. + * + */ + +/* + * "The roots of those mountains must be roots indeed; there must be + * great secrets buried there which have not been discovered since the + * beginning." --Gandalf, relating Gollum's story + */ + #include "EXTERN.h" #define PERL_IN_UNIVERSAL_C #include "perl.h" @@ -8,7 +23,8 @@ */ STATIC SV * -S_isa_lookup(pTHX_ HV *stash, const char *name, int len, int level) +S_isa_lookup(pTHX_ HV *stash, const char *name, HV* name_stash, + int len, int level) { AV* av; GV* gv; @@ -16,8 +32,10 @@ S_isa_lookup(pTHX_ HV *stash, const char *name, int len, int level) HV* hv = Nullhv; SV* subgen = Nullsv; - if (!stash) - return &PL_sv_undef; + /* 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)) return &PL_sv_yes; @@ -31,7 +49,7 @@ S_isa_lookup(pTHX_ HV *stash, const char *name, int len, int level) if (gvp && (gv = *gvp) != (GV*)&PL_sv_undef && (subgen = GvSV(gv)) && (hv = GvHV(gv))) { - if (SvIV(subgen) == PL_sub_generation) { + if (SvIV(subgen) == (IV)PL_sub_generation) { SV* sv; SV** svp = (SV**)hv_fetch(hv, name, len, FALSE); if (svp && (sv = *svp) != (SV*)&PL_sv_undef) { @@ -75,12 +93,13 @@ S_isa_lookup(pTHX_ HV *stash, const char *name, int len, int level) HV* basestash = gv_stashsv(sv, FALSE); if (!basestash) { if (ckWARN(WARN_MISC)) - Perl_warner(aTHX_ WARN_SYNTAX, + Perl_warner(aTHX_ packWARN(WARN_SYNTAX), "Can't locate package %s for @%s::ISA", SvPVX(sv), HvNAME(stash)); continue; } - if (&PL_sv_yes == isa_lookup(basestash, name, len, level + 1)) { + if (&PL_sv_yes == isa_lookup(basestash, name, name_stash, + len, level + 1)) { (void)hv_store(hv,name,len,&PL_sv_yes,0); return &PL_sv_yes; } @@ -93,6 +112,8 @@ S_isa_lookup(pTHX_ HV *stash, const char *name, int len, int level) } /* +=head1 SV Manipulation Functions + =for apidoc sv_derived_from Returns a boolean indicating whether the SV is derived from the specified @@ -107,6 +128,7 @@ Perl_sv_derived_from(pTHX_ SV *sv, const char *name) { char *type; HV *stash; + HV *name_stash; stash = Nullhv; type = Nullch; @@ -124,17 +146,20 @@ Perl_sv_derived_from(pTHX_ SV *sv, const char *name) stash = gv_stashsv(sv, FALSE); } + name_stash = gv_stashpv(name, FALSE); + return (type && strEQ(type,name)) || - (stash && isa_lookup(stash, name, strlen(name), 0) == &PL_sv_yes) + (stash && isa_lookup(stash, name, name_stash, strlen(name), 0) + == &PL_sv_yes) ? TRUE : FALSE ; } #include "XSUB.h" -void XS_UNIVERSAL_isa(pTHXo_ CV *cv); -void XS_UNIVERSAL_can(pTHXo_ CV *cv); -void XS_UNIVERSAL_VERSION(pTHXo_ CV *cv); +void XS_UNIVERSAL_isa(pTHX_ CV *cv); +void XS_UNIVERSAL_can(pTHX_ CV *cv); +void XS_UNIVERSAL_VERSION(pTHX_ CV *cv); XS(XS_utf8_valid); XS(XS_utf8_encode); XS(XS_utf8_decode); @@ -142,6 +167,9 @@ XS(XS_utf8_upgrade); XS(XS_utf8_downgrade); XS(XS_utf8_unicode_to_native); XS(XS_utf8_native_to_unicode); +XS(XS_Internals_SvREADONLY); +XS(XS_Internals_SvREFCNT); +XS(XS_Internals_hv_clear_placehold); void Perl_boot_core_UNIVERSAL(pTHX) @@ -158,6 +186,10 @@ Perl_boot_core_UNIVERSAL(pTHX) newXS("utf8::downgrade", XS_utf8_downgrade, file); newXS("utf8::native_to_unicode", XS_utf8_native_to_unicode, file); newXS("utf8::unicode_to_native", XS_utf8_unicode_to_native, file); + newXSproto("Internals::SvREADONLY",XS_Internals_SvREADONLY, file, "\\[$%@];$"); + newXSproto("Internals::SvREFCNT",XS_Internals_SvREFCNT, file, "\\[$%@];$"); + newXSproto("Internals::hv_clear_placeholders", + XS_Internals_hv_clear_placehold, file, "\\%"); } @@ -263,10 +295,18 @@ XS(XS_UNIVERSAL_VERSION) STRLEN len; SV *req = ST(1); - if (undef) - Perl_croak(aTHX_ "%s does not define $%s::VERSION--version check failed", - HvNAME(pkg), HvNAME(pkg)); - + if (undef) { + if (pkg) + Perl_croak(aTHX_ + "%s does not define $%s::VERSION--version check failed", + HvNAME(pkg), HvNAME(pkg)); + else { + char *str = SvPVx(ST(0), len); + + Perl_croak(aTHX_ + "%s defines neither package nor VERSION--version check failed", str); + } + } if (!SvNIOK(sv) && SvPOK(sv)) { char *str = SvPVx(sv,len); while (len) { @@ -425,4 +465,90 @@ XS(XS_utf8_unicode_to_native) XSRETURN(1); } +XS(XS_Internals_SvREADONLY) /* This is dangerous stuff. */ +{ + dXSARGS; + SV *sv = SvRV(ST(0)); + if (items == 1) { + if (SvREADONLY(sv)) + XSRETURN_YES; + else + XSRETURN_NO; + } + else if (items == 2) { + if (SvTRUE(ST(1))) { + SvREADONLY_on(sv); + XSRETURN_YES; + } + else { + /* I hope you really know what you are doing. */ + SvREADONLY_off(sv); + XSRETURN_NO; + } + } + XSRETURN_UNDEF; /* Can't happen. */ +} +XS(XS_Internals_SvREFCNT) /* This is dangerous stuff. */ +{ + dXSARGS; + SV *sv = SvRV(ST(0)); + if (items == 1) + XSRETURN_IV(SvREFCNT(sv) - 1); /* Minus the ref created for us. */ + else if (items == 2) { + /* I hope you really know what you are doing. */ + SvREFCNT(sv) = SvIV(ST(1)); + XSRETURN_IV(SvREFCNT(sv)); + } + XSRETURN_UNDEF; /* Can't happen. */ +} + +/* Maybe this should return the number of placeholders found in scalar context, + and a list of them in list context. */ +XS(XS_Internals_hv_clear_placehold) +{ + dXSARGS; + HV *hv = (HV *) SvRV(ST(0)); + + /* I don't care how many parameters were passed in, but I want to avoid + the unused variable warning. */ + + items = (I32)HvPLACEHOLDERS(hv); + + if (items) { + HE *entry; + I32 riter = HvRITER(hv); + HE *eiter = HvEITER(hv); + hv_iterinit(hv); + /* This may look suboptimal with the items *after* the iternext, but + it's quite deliberate. We only get here with items==0 if we've + just deleted the last placeholder in the hash. If we've just done + that then it means that the hash is in lazy delete mode, and the + HE is now only referenced in our iterator. If we just quit the loop + and discarded our iterator then the HE leaks. So we do the && the + other way to ensure iternext is called just one more time, which + has the side effect of triggering the lazy delete. */ + while ((entry = hv_iternext_flags(hv, HV_ITERNEXT_WANTPLACEHOLDERS)) + && items) { + SV *val = hv_iterval(hv, entry); + + if (val == &PL_sv_undef) { + + /* It seems that I have to go back in the front of the hash + API to delete a hash, even though I have a HE structure + pointing to the very entry I want to delete, and could hold + onto the previous HE that points to it. And it's easier to + go in with SVs as I can then specify the precomputed hash, + and don't have fun and games with utf8 keys. */ + SV *key = hv_iterkeysv(entry); + + hv_delete_ent (hv, key, G_DISCARD, HeHASH(entry)); + items--; + } + } + HvRITER(hv) = riter; + HvEITER(hv) = eiter; + } + + XSRETURN(0); +}