X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=universal.c;h=85a09161d281f6c6c5514d85d60d4d102f2b5232;hb=8f675a64451b3c11c234adeda6be313fb8d03f6c;hp=6c555a1347d3d53fed32895f507d13c307f5c5c2;hpb=92d29cee5ff815b05b81b877528e4c77e73881c9;p=p5sagit%2Fp5-mst-13.2.git diff --git a/universal.c b/universal.c index 6c555a1..85a0916 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; @@ -74,14 +92,14 @@ S_isa_lookup(pTHX_ HV *stash, const char *name, int len, int level) SV* sv = *svp++; HV* basestash = gv_stashsv(sv, FALSE); if (!basestash) { - dTHR; 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; } @@ -94,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 @@ -108,6 +128,7 @@ Perl_sv_derived_from(pTHX_ SV *sv, const char *name) { char *type; HV *stash; + HV *name_stash; stash = Nullhv; type = Nullch; @@ -125,15 +146,29 @@ 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 ; } -void XS_UNIVERSAL_isa(pTHXo_ CV *cv); -void XS_UNIVERSAL_can(pTHXo_ CV *cv); -void XS_UNIVERSAL_VERSION(pTHXo_ CV *cv); +#include "XSUB.h" + +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); +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); void Perl_boot_core_UNIVERSAL(pTHX) @@ -143,9 +178,17 @@ Perl_boot_core_UNIVERSAL(pTHX) newXS("UNIVERSAL::isa", XS_UNIVERSAL_isa, file); newXS("UNIVERSAL::can", XS_UNIVERSAL_can, file); newXS("UNIVERSAL::VERSION", XS_UNIVERSAL_VERSION, file); + newXS("utf8::valid", XS_utf8_valid, file); + newXS("utf8::encode", XS_utf8_encode, file); + newXS("utf8::decode", XS_utf8_decode, file); + newXS("utf8::upgrade", XS_utf8_upgrade, file); + 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, "\\[$%@];$"); } -#include "XSUB.h" XS(XS_UNIVERSAL_isa) { @@ -249,10 +292,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) { @@ -266,8 +317,8 @@ XS(XS_UNIVERSAL_VERSION) /* they said C and $Foo::VERSION * doesn't look like a float: do string compare */ if (sv_cmp(req,sv) == 1) { - Perl_croak(aTHX_ "%s v%vd required--" - "this is only v%vd", + Perl_croak(aTHX_ "%s v%"VDf" required--" + "this is only v%"VDf, HvNAME(pkg), req, sv); } goto finish; @@ -291,7 +342,7 @@ XS(XS_UNIVERSAL_VERSION) if (SvNV(req) > SvNV(sv)) Perl_croak(aTHX_ "%s version %s required--this is only version %s", - HvNAME(pkg), SvPV(req,len), SvPV(sv,len)); + HvNAME(pkg), SvPV_nolen(req), SvPV_nolen(sv)); } finish: @@ -300,3 +351,152 @@ finish: XSRETURN(1); } +XS(XS_utf8_valid) +{ + dXSARGS; + if (items != 1) + Perl_croak(aTHX_ "Usage: utf8::valid(sv)"); + { + SV * sv = ST(0); + { + STRLEN len; + char *s = SvPV(sv,len); + if (!SvUTF8(sv) || is_utf8_string((U8*)s,len)) + XSRETURN_YES; + else + XSRETURN_NO; + } + } + XSRETURN_EMPTY; +} + +XS(XS_utf8_encode) +{ + dXSARGS; + if (items != 1) + Perl_croak(aTHX_ "Usage: utf8::encode(sv)"); + { + SV * sv = ST(0); + + sv_utf8_encode(sv); + } + XSRETURN_EMPTY; +} + +XS(XS_utf8_decode) +{ + dXSARGS; + if (items != 1) + Perl_croak(aTHX_ "Usage: utf8::decode(sv)"); + { + SV * sv = ST(0); + bool RETVAL; + + RETVAL = sv_utf8_decode(sv); + ST(0) = boolSV(RETVAL); + sv_2mortal(ST(0)); + } + XSRETURN(1); +} + +XS(XS_utf8_upgrade) +{ + dXSARGS; + if (items != 1) + Perl_croak(aTHX_ "Usage: utf8::upgrade(sv)"); + { + SV * sv = ST(0); + STRLEN RETVAL; + dXSTARG; + + RETVAL = sv_utf8_upgrade(sv); + XSprePUSH; PUSHi((IV)RETVAL); + } + XSRETURN(1); +} + +XS(XS_utf8_downgrade) +{ + dXSARGS; + if (items < 1 || items > 2) + Perl_croak(aTHX_ "Usage: utf8::downgrade(sv, failok=0)"); + { + SV * sv = ST(0); + bool failok; + bool RETVAL; + + if (items < 2) + failok = 0; + else { + failok = (int)SvIV(ST(1)); + } + + RETVAL = sv_utf8_downgrade(sv, failok); + ST(0) = boolSV(RETVAL); + sv_2mortal(ST(0)); + } + XSRETURN(1); +} + +XS(XS_utf8_native_to_unicode) +{ + dXSARGS; + UV uv = SvUV(ST(0)); + + if (items > 1) + Perl_croak(aTHX_ "Usage: utf8::native_to_unicode(sv)"); + + ST(0) = sv_2mortal(newSViv(NATIVE_TO_UNI(uv))); + XSRETURN(1); +} + +XS(XS_utf8_unicode_to_native) +{ + dXSARGS; + UV uv = SvUV(ST(0)); + + if (items > 1) + Perl_croak(aTHX_ "Usage: utf8::unicode_to_native(sv)"); + + ST(0) = sv_2mortal(newSViv(UNI_TO_NATIVE(uv))); + 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. */ +} +