#include "EXTERN.h"
#define PERL_IN_GV_C
#include "perl.h"
+#include "overload.c"
static const char S_autoload[] = "AUTOLOAD";
static const STRLEN S_autolen = sizeof(S_autoload)-1;
GV *
Perl_gv_SVadd(pTHX_ GV *gv)
{
+ PERL_ARGS_ASSERT_GV_SVADD;
+
if (!gv || SvTYPE((SV*)gv) != SVt_PVGV)
Perl_croak(aTHX_ "Bad symbol for scalar");
if (!GvSV(gv))
GV *
Perl_gv_AVadd(pTHX_ register GV *gv)
{
+ PERL_ARGS_ASSERT_GV_AVADD;
+
if (!gv || SvTYPE((SV*)gv) != SVt_PVGV)
Perl_croak(aTHX_ "Bad symbol for array");
if (!GvAV(gv))
GV *
Perl_gv_HVadd(pTHX_ register GV *gv)
{
+ PERL_ARGS_ASSERT_GV_HVADD;
+
if (!gv || SvTYPE((SV*)gv) != SVt_PVGV)
Perl_croak(aTHX_ "Bad symbol for hash");
if (!GvHV(gv))
Perl_gv_IOadd(pTHX_ register GV *gv)
{
dVAR;
+
+ PERL_ARGS_ASSERT_GV_IOADD;
+
if (!gv || SvTYPE((SV*)gv) != SVt_PVGV) {
/*
GV *
Perl_gv_fetchfile(pTHX_ const char *name)
{
+ PERL_ARGS_ASSERT_GV_FETCHFILE;
return gv_fetchfile_flags(name, strlen(name), 0);
}
const STRLEN tmplen = namelen + 2;
GV *gv;
+ PERL_ARGS_ASSERT_GV_FETCHFILE_FLAGS;
PERL_UNUSED_ARG(flags);
if (!PL_defstash)
SV *
Perl_gv_const_sv(pTHX_ GV *gv)
{
+ PERL_ARGS_ASSERT_GV_CONST_SV;
+
if (SvTYPE(gv) == SVt_PVGV)
return cv_const_sv(GvCVu(gv));
return SvROK(gv) ? SvRV(gv) : NULL;
Perl_newGP(pTHX_ GV *const gv)
{
GP *gp;
+ U32 hash;
+#ifdef USE_ITHREADS
const char *const file
= (PL_curcop && CopFILE(PL_curcop)) ? CopFILE(PL_curcop) : "";
- STRLEN len = strlen(file);
- U32 hash;
+ const STRLEN len = strlen(file);
+#else
+ SV *const temp_sv = CopFILESV(PL_curcop);
+ const char *file;
+ STRLEN len;
+
+ PERL_ARGS_ASSERT_NEWGP;
+
+ if (temp_sv) {
+ file = SvPVX(temp_sv);
+ len = SvCUR(temp_sv);
+ } else {
+ file = "";
+ len = 0;
+ }
+#endif
PERL_HASH(hash, file, len);
dVAR;
const U32 old_type = SvTYPE(gv);
const bool doproto = old_type > SVt_NULL;
- const char * const proto = (doproto && SvPOK(gv)) ? SvPVX_const(gv) : NULL;
+ char * const proto = (doproto && SvPOK(gv)) ? SvPVX(gv) : NULL;
+ const STRLEN protolen = proto ? SvCUR(gv) : 0;
SV *const has_constant = doproto && SvROK(gv) ? SvRV(gv) : NULL;
const U32 exported_constant = has_constant ? SvPCS_IMPORTED(gv) : 0;
+ PERL_ARGS_ASSERT_GV_INIT;
assert (!(proto && has_constant));
if (has_constant) {
CvFILE_set_from_cop(GvCV(gv), PL_curcop);
CvSTASH(GvCV(gv)) = PL_curstash;
if (proto) {
- sv_setpv((SV*)GvCV(gv), proto);
- Safefree(proto);
+ sv_usepvn_flags((SV*)GvCV(gv), proto, protolen,
+ SV_HAS_TRAILING_NUL);
}
}
}
STATIC void
-S_gv_init_sv(pTHX_ GV *gv, I32 sv_type)
+S_gv_init_sv(pTHX_ GV *gv, const svtype sv_type)
{
+ PERL_ARGS_ASSERT_GV_INIT_SV;
+
switch (sv_type) {
case SVt_PVIO:
(void)GvIOn(gv);
STRLEN packlen;
U32 topgen_cmp;
+ PERL_ARGS_ASSERT_GV_FETCHMETH;
+
/* UNIVERSAL methods should be callable without a stash */
if (!stash) {
create = 0; /* probably appropriate */
{
GV *gv = gv_fetchmeth(stash, name, len, level);
+ PERL_ARGS_ASSERT_GV_FETCHMETH_AUTOLOAD;
+
if (!gv) {
CV *cv;
GV **gvp;
if (!stash)
return NULL; /* UNIVERSAL::AUTOLOAD could cause trouble */
- if (len == S_autolen && strnEQ(name, S_autoload, S_autolen))
+ if (len == S_autolen && memEQ(name, S_autoload, S_autolen))
return NULL;
if (!(gv = gv_fetchmeth(stash, S_autoload, S_autolen, FALSE)))
return NULL;
=cut
*/
+STATIC HV*
+S_gv_get_super_pkg(pTHX_ const char* name, I32 namelen)
+{
+ AV* superisa;
+ GV** gvp;
+ GV* gv;
+ HV* stash;
+
+ PERL_ARGS_ASSERT_GV_GET_SUPER_PKG;
+
+ stash = gv_stashpvn(name, namelen, 0);
+ if(stash) return stash;
+
+ /* If we must create it, give it an @ISA array containing
+ the real package this SUPER is for, so that it's tied
+ into the cache invalidation code correctly */
+ stash = gv_stashpvn(name, namelen, GV_ADD);
+ gvp = (GV**)hv_fetchs(stash, "ISA", TRUE);
+ gv = *gvp;
+ gv_init(gv, stash, "ISA", 3, TRUE);
+ superisa = GvAVn(gv);
+ GvMULTI_on(gv);
+ sv_magic((SV*)superisa, (SV*)gv, PERL_MAGIC_isa, NULL, 0);
+#ifdef USE_ITHREADS
+ av_push(superisa, newSVpv(CopSTASHPV(PL_curcop), 0));
+#else
+ av_push(superisa, newSVhek(CopSTASH(PL_curcop)
+ ? HvNAME_HEK(CopSTASH(PL_curcop)) : NULL));
+#endif
+
+ return stash;
+}
+
+/* FIXME. If changing this function note the comment in pp_hot's
+ S_method_common:
+
+ This code tries to figure out just what went wrong with
+ gv_fetchmethod. It therefore needs to duplicate a lot of
+ the internals of that function. ...
+
+ I'd guess that with one more flag bit that could all be moved inside
+ here.
+*/
+
GV *
Perl_gv_fetchmethod_autoload(pTHX_ HV *stash, const char *name, I32 autoload)
{
GV* gv;
HV* ostash = stash;
+ PERL_ARGS_ASSERT_GV_FETCHMETHOD_AUTOLOAD;
+
if (stash && SvTYPE(stash) < SVt_PVHV)
stash = NULL;
name = nsplit + 1;
if (*nsplit == ':')
--nsplit;
- if ((nsplit - origname) == 5 && strnEQ(origname, "SUPER", 5)) {
+ if ((nsplit - origname) == 5 && memEQ(origname, "SUPER", 5)) {
/* ->SUPER::method should really be looked up in original stash */
SV * const tmpstr = sv_2mortal(Perl_newSVpvf(aTHX_ "%s::SUPER",
CopSTASHPV(PL_curcop)));
/* __PACKAGE__::SUPER stash should be autovivified */
- stash = gv_stashpvn(SvPVX_const(tmpstr), SvCUR(tmpstr), GV_ADD);
+ stash = gv_get_super_pkg(SvPVX_const(tmpstr), SvCUR(tmpstr));
DEBUG_o( Perl_deb(aTHX_ "Treating %s as %s::%s\n",
origname, HvNAME_get(stash), name) );
}
if (!stash && (nsplit - origname) >= 7 &&
strnEQ(nsplit - 7, "::SUPER", 7) &&
gv_stashpvn(origname, nsplit - origname - 7, 0))
- stash = gv_stashpvn(origname, nsplit - origname, GV_ADD);
+ stash = gv_get_super_pkg(origname, nsplit - origname);
}
ostash = stash;
}
const char *packname = "";
STRLEN packname_len = 0;
- if (len == S_autolen && strnEQ(name, S_autoload, S_autolen))
+ PERL_ARGS_ASSERT_GV_AUTOLOAD4;
+
+ if (len == S_autolen && memEQ(name, S_autoload, S_autolen))
return NULL;
if (stash) {
if (SvTYPE(stash) < SVt_PVHV) {
dVAR;
HV* stash = gv_stashsv(namesv, 0);
+ PERL_ARGS_ASSERT_REQUIRE_TIE_MOD;
+
if (!stash || !(gv_fetchmethod(stash, methpv))) {
SV *module = newSVsv(namesv);
char varname = *varpv; /* varpv might be clobbered by load_module,
HV*
Perl_gv_stashpv(pTHX_ const char *name, I32 create)
{
+ PERL_ARGS_ASSERT_GV_STASHPV;
return gv_stashpvn(name, strlen(name), create);
}
HV *stash;
GV *tmpgv;
+ PERL_ARGS_ASSERT_GV_STASHPVN;
+
if (namelen + 2 <= sizeof smallbuf)
tmpbuf = smallbuf;
else
{
STRLEN len;
const char * const ptr = SvPV_const(sv,len);
+
+ PERL_ARGS_ASSERT_GV_STASHSV;
+
return gv_stashpvn(ptr, len, flags);
}
GV *
-Perl_gv_fetchpv(pTHX_ const char *nambeg, I32 add, I32 sv_type) {
+Perl_gv_fetchpv(pTHX_ const char *nambeg, I32 add, const svtype sv_type) {
+ PERL_ARGS_ASSERT_GV_FETCHPV;
return gv_fetchpvn_flags(nambeg, strlen(nambeg), add, sv_type);
}
GV *
-Perl_gv_fetchsv(pTHX_ SV *name, I32 flags, I32 sv_type) {
+Perl_gv_fetchsv(pTHX_ SV *name, I32 flags, const svtype sv_type) {
STRLEN len;
const char * const nambeg = SvPV_const(name, len);
+ PERL_ARGS_ASSERT_GV_FETCHSV;
return gv_fetchpvn_flags(nambeg, len, flags | SvUTF8(name), sv_type);
}
GV *
Perl_gv_fetchpvn_flags(pTHX_ const char *nambeg, STRLEN full_len, I32 flags,
- I32 sv_type)
+ const svtype sv_type)
{
dVAR;
register const char *name = nambeg;
const I32 add = flags & ~GV_NOADD_MASK;
const char *const name_end = nambeg + full_len;
const char *const name_em1 = name_end - 1;
+ U32 faking_it;
+
+ PERL_ARGS_ASSERT_GV_FETCHPVN_FLAGS;
if (flags & GV_NOTQUAL) {
/* Caller promised that there is no stash, so we can skip the check. */
if (*name == '!')
require_tie_mod(gv, "!", newSVpvs("Errno"), "TIEHASH", 1);
else if (*name == '-' || *name == '+')
- require_tie_mod(gv, name, newSVpvs("Tie::Hash::NamedCapture"), "FETCH", 0);
+ require_tie_mod(gv, name, newSVpvs("Tie::Hash::NamedCapture"), "TIEHASH", 0);
}
}
return gv;
return gv;
}
- /* Adding a new symbol */
+ /* Adding a new symbol.
+ Unless of course there was already something non-GV here, in which case
+ we want to behave as if there was always a GV here, containing some sort
+ of subroutine.
+ Otherwise we run the risk of creating things like GvIO, which can cause
+ subtle bugs. eg the one that tripped up SQL::Translator */
+
+ faking_it = SvOK(gv);
if (add & GV_ADDWARN && ckWARN_d(WARN_INTERNAL))
Perl_warner(aTHX_ packWARN(WARN_INTERNAL), "Had to create %s unexpectedly", nambeg);
gv_init(gv, stash, name, len, add & GV_ADDMULTI);
- gv_init_sv(gv, sv_type);
+ gv_init_sv(gv, faking_it ? SVt_PVCV : sv_type);
if (isALPHA(name[0]) && ! (isLEXWARN_on ? ckWARN(WARN_ONCE)
: (PL_dowarn & G_WARN_ON ) ) )
SvREADONLY_on(av);
if (sv_type == SVt_PVHV || sv_type == SVt_PVGV)
- require_tie_mod(gv, name, newSVpvs("Tie::Hash::NamedCapture"), "FETCH", 0);
+ require_tie_mod(gv, name, newSVpvs("Tie::Hash::NamedCapture"), "TIEHASH", 0);
break;
}
case '*':
case '#':
- if (sv_type == SVt_PV && ckWARN2(WARN_DEPRECATED, WARN_SYNTAX))
+ if (sv_type == SVt_PV && ckWARN2_d(WARN_DEPRECATED, WARN_SYNTAX))
Perl_warner(aTHX_ packWARN2(WARN_DEPRECATED, WARN_SYNTAX),
"$%c is no longer supported", *name);
break;
const char *name;
STRLEN namelen;
const HV * const hv = GvSTASH(gv);
+
+ PERL_ARGS_ASSERT_GV_FULLNAME4;
+
if (!hv) {
SvOK_off(sv);
return;
Perl_gv_efullname4(pTHX_ SV *sv, const GV *gv, const char *prefix, bool keepmain)
{
const GV * const egv = GvEGV(gv);
+
+ PERL_ARGS_ASSERT_GV_EFULLNAME4;
+
gv_fullname4(sv, egv ? egv : gv, prefix, keepmain);
}
dVAR;
register I32 i;
+ PERL_ARGS_ASSERT_GV_CHECK;
+
if (!HvARRAY(stash))
return;
for (i = 0; i <= (I32) HvMAX(stash); i++) {
#ifdef USE_ITHREADS
CopFILE(PL_curcop) = (char *)file; /* set for warning */
#else
- CopFILEGV(PL_curcop) = gv_fetchfile(file);
+ CopFILEGV(PL_curcop)
+ = gv_fetchfile_flags(file, HEK_LEN(GvFILE_HEK(gv)), 0);
#endif
Perl_warner(aTHX_ packWARN(WARN_ONCE),
"Name \"%s::%s\" used only once: possible typo",
Perl_newGVgen(pTHX_ const char *pack)
{
dVAR;
+
+ PERL_ARGS_ASSERT_NEWGVGEN;
+
return gv_fetchpv(Perl_form(aTHX_ "%s::_GEN_%ld", pack, (long)PL_gensym++),
GV_ADD, SVt_PVGV);
}
if (gp->gp_hv && SvTYPE(gp->gp_hv) == SVt_PVHV) {
const char *hvname = HvNAME_get(gp->gp_hv);
if (PL_stashcache && hvname)
- hv_delete(PL_stashcache, hvname, HvNAMELEN_get(gp->gp_hv),
+ (void)hv_delete(PL_stashcache, hvname, HvNAMELEN_get(gp->gp_hv),
G_DISCARD);
SvREFCNT_dec(gp->gp_hv);
}
AMT * const amtp = (AMT*)mg->mg_ptr;
PERL_UNUSED_ARG(sv);
+ PERL_ARGS_ASSERT_MAGIC_FREEOVRLD;
+
if (amtp && AMT_AMAGIC(amtp)) {
int i;
for (i = 1; i < NofAMmeth; i++) {
dVAR;
MAGIC* const mg = mg_find((SV*)stash, PERL_MAGIC_overload_table);
AMT amt;
+ const struct mro_meta* stash_meta = HvMROMETA(stash);
U32 newgen;
- newgen = PL_sub_generation + HvMROMETA(stash)->cache_gen;
+ PERL_ARGS_ASSERT_GV_AMUPDATE;
+
+ newgen = PL_sub_generation + stash_meta->pkg_gen + stash_meta->cache_gen;
if (mg) {
const AMT * const amtp = (AMT*)mg->mg_ptr;
if (amtp->was_ok_am == PL_amagic_generation
const char * const cooky = PL_AMG_names[i];
/* Human-readable form, for debugging: */
const char * const cp = (i >= DESTROY_amg ? cooky : AMG_id2name(i));
- const STRLEN l = strlen(cooky);
+ const STRLEN l = PL_AMG_namelens[i];
DEBUG_o( Perl_deb(aTHX_ "Checking overloading of \"%s\" in package \"%.256s\"\n",
cp, HvNAME_get(stash)) );
MAGIC *mg;
AMT *amtp;
U32 newgen;
+ struct mro_meta* stash_meta;
if (!stash || !HvNAME_get(stash))
return NULL;
- newgen = PL_sub_generation + HvMROMETA(stash)->cache_gen;
+ stash_meta = HvMROMETA(stash);
+ newgen = PL_sub_generation + stash_meta->pkg_gen + stash_meta->cache_gen;
mg = mg_find((SV*)stash, PERL_MAGIC_overload_table);
if (!mg) {
int fl=0;
#endif
HV* stash=NULL;
+
+ PERL_ARGS_ASSERT_AMAGIC_CALL;
+
if (!(AMGf_noleft & flags) && SvAMAGIC(left)
&& (stash = SvSTASH(SvRV(left)))
&& (mg = mg_find((SV*)stash, PERL_MAGIC_overload_table))
PUSHs(lr>0? left: right);
PUSHs( lr > 0 ? &PL_sv_yes : ( assign ? &PL_sv_undef : &PL_sv_no ));
if (notfound) {
- PUSHs( sv_2mortal(newSVpv(AMG_id2name(method + assignshift),0)));
+ PUSHs(newSVpvn_flags(AMG_id2name(method + assignshift),
+ AMG_id2namelen(method + assignshift), SVs_TEMP));
}
PUSHs((SV*)cv);
PUTBACK;
{
STRLEN len;
const char * const temp = SvPV_const(name, len);
+
+ PERL_ARGS_ASSERT_IS_GV_MAGICAL_SV;
+
return is_gv_magical(temp, len, flags);
}
PERL_UNUSED_CONTEXT;
PERL_UNUSED_ARG(flags);
+ PERL_ARGS_ASSERT_IS_GV_MAGICAL;
+
if (len > 1) {
const char * const name1 = name + 1;
switch (*name) {
case 'I':
- if (len == 3 && name1[1] == 'S' && name[2] == 'A')
+ if (len == 3 && name[1] == 'S' && name[2] == 'A')
goto yes;
break;
case 'O':
dVAR;
U32 hash;
- assert(name);
+ PERL_ARGS_ASSERT_GV_NAME_SET;
PERL_UNUSED_ARG(flags);
if (len > I32_MAX)
https://perl5.git.perl.org / perl5.git / blobdiff