X-Git-Url: https://perl5.git.perl.org/perl5.git/blobdiff_plain/643fe3684c67762f638e3528054ff5ca1d3e0cb6..b5b6210a976:/pad.h diff --git a/pad.h b/pad.h index 01456a7..c29a13f 100644 --- a/pad.h +++ b/pad.h @@ -31,8 +31,7 @@ typedef U64TYPE PADOFFSET; struct padlist { SSize_t xpadl_max; /* max index for which array has space */ PAD ** xpadl_alloc; /* pointer to beginning of array of AVs */ - U32 xpadl_id; /* Semi-unique ID, shared between clones */ - U32 xpadl_outid; /* ID of outer pad */ + PADNAMELIST*xpadl_outid; /* Padnamelist of outer pad; used as ID */ }; @@ -136,22 +135,20 @@ typedef enum { * whether PL_comppad and PL_curpad are consistent and whether they have * active values */ -#ifndef PERL_MAD # define pad_peg(label) -#endif #ifdef DEBUGGING # define ASSERT_CURPAD_LEGAL(label) \ pad_peg(label); \ if (PL_comppad ? (AvARRAY(PL_comppad) != PL_curpad) : (PL_curpad != 0)) \ - Perl_croak(aTHX_ "panic: illegal pad in %s: 0x%"UVxf"[0x%"UVxf"]",\ + Perl_croak(aTHX_ "panic: illegal pad in %s: 0x%" UVxf "[0x%" UVxf "]",\ label, PTR2UV(PL_comppad), PTR2UV(PL_curpad)); # define ASSERT_CURPAD_ACTIVE(label) \ pad_peg(label); \ if (!PL_comppad || (AvARRAY(PL_comppad) != PL_curpad)) \ - Perl_croak(aTHX_ "panic: invalid pad in %s: 0x%"UVxf"[0x%"UVxf"]",\ + Perl_croak(aTHX_ "panic: invalid pad in %s: 0x%" UVxf "[0x%" UVxf "]",\ label, PTR2UV(PL_comppad), PTR2UV(PL_curpad)); #else # define ASSERT_CURPAD_LEGAL(label) @@ -169,7 +166,8 @@ Save a pad slot (used to restore after an iteration) XXX DAPM it would make more sense to make the arg a PADOFFSET =for apidoc m|void|SAVECLEARSV |SV **svp -Clear the pointed to pad value on scope exit. (i.e. the runtime action of 'my') +Clear the pointed to pad value on scope exit. (i.e. the runtime action of +'my') =for apidoc m|void|SAVECOMPPAD save PL_comppad and PL_curpad @@ -180,7 +178,9 @@ The C array of a padlist, containing the pads. Only subscript it with numbers >= 1, as the 0th entry is not guaranteed to remain usable. =for apidoc Amx|SSize_t|PadlistMAX|PADLIST padlist -The index of the last pad in the padlist. +The index of the last allocated space in the padlist. Note that the last +pad may be in an earlier slot. Any entries following it will be NULL in +that case. =for apidoc Amx|PADNAMELIST *|PadlistNAMES|PADLIST padlist The names associated with pad entries. @@ -229,7 +229,7 @@ The stash in which this "our" variable was declared. =for apidoc m|bool|PadnameOUTER|PADNAME pn Whether this entry belongs to an outer pad. -=for apidoc m|bool|PadnameSTATE|PADNAME pn +=for apidoc m|bool|PadnameIsSTATE|PADNAME pn Whether this is a "state" variable. =for apidoc m|HV *|PadnameTYPE|PADNAME pn @@ -254,7 +254,7 @@ Get the value from slot C in the base (DEPTH=1) pad of a padlist =for apidoc m|void|PAD_SET_CUR |PADLIST padlist|I32 n Set the current pad to be pad C in the padlist, saving -the previous current pad. NB currently this macro expands to a string too +the previous current pad. NB currently this macro expands to a string too long for some compilers, so it's best to replace it with SAVECOMPPAD(); @@ -286,18 +286,20 @@ Restore the old pad saved into the local variable opad by PAD_SAVE_LOCAL() #define PadnamelistARRAY(pnl) AvARRAY(pnl) #define PadnamelistMAX(pnl) AvFILLp(pnl) +#define PadnamelistMAXNAMED(pnl) \ + ((XPVAV*) SvANY(pnl))->xmg_u.xmg_hash_index #define PadARRAY(pad) AvARRAY(pad) #define PadMAX(pad) AvFILLp(pad) #define PadnamePV(pn) (SvPOKp(pn) ? SvPVX(pn) : NULL) -#define PadnameLEN(pn) SvCUR(pn) +#define PadnameLEN(pn) ((pn) == &PL_sv_undef ? 0 : SvCUR(pn)) #define PadnameUTF8(pn) !!SvUTF8(pn) #define PadnameSV(pn) pn #define PadnameIsOUR(pn) !!SvPAD_OUR(pn) #define PadnameOURSTASH(pn) SvOURSTASH(pn) #define PadnameOUTER(pn) !!SvFAKE(pn) -#define PadnameSTATE(pn) SvPAD_STATE(pn) +#define PadnameIsSTATE(pn) !!SvPAD_STATE(pn) #define PadnameTYPE(pn) (SvPAD_TYPED(pn) ? SvSTASH(pn) : NULL) @@ -321,7 +323,7 @@ Restore the old pad saved into the local variable opad by PAD_SAVE_LOCAL() PL_comppad = (PAD*) (PadlistARRAY(padlist)[nth]); \ PL_curpad = AvARRAY(PL_comppad); \ DEBUG_Xv(PerlIO_printf(Perl_debug_log, \ - "Pad 0x%"UVxf"[0x%"UVxf"] set_cur depth=%d\n", \ + "Pad 0x%" UVxf "[0x%" UVxf "] set_cur depth=%d\n", \ PTR2UV(PL_comppad), PTR2UV(PL_curpad), (int)(nth))); @@ -339,7 +341,7 @@ Restore the old pad saved into the local variable opad by PAD_SAVE_LOCAL() PL_comppad = (npad); \ PL_curpad = PL_comppad ? AvARRAY(PL_comppad) : NULL; \ DEBUG_Xv(PerlIO_printf(Perl_debug_log, \ - "Pad 0x%"UVxf"[0x%"UVxf"] save_local\n", \ + "Pad 0x%" UVxf "[0x%" UVxf "] save_local\n", \ PTR2UV(PL_comppad), PTR2UV(PL_curpad))); #define PAD_RESTORE_LOCAL(opad) \ @@ -347,7 +349,7 @@ Restore the old pad saved into the local variable opad by PAD_SAVE_LOCAL() PL_comppad = opad; \ PL_curpad = PL_comppad ? AvARRAY(PL_comppad) : NULL; \ DEBUG_Xv(PerlIO_printf(Perl_debug_log, \ - "Pad 0x%"UVxf"[0x%"UVxf"] restore_local\n", \ + "Pad 0x%" UVxf "[0x%" UVxf "] restore_local\n", \ PTR2UV(PL_comppad), PTR2UV(PL_curpad))); @@ -369,15 +371,15 @@ context block structure (can be used as an lvalue). /* =for apidoc m|U32|PAD_COMPNAME_FLAGS|PADOFFSET po Return the flags for the current compiling pad name -at offset C. Assumes a valid slot entry. +at offset C. Assumes a valid slot entry. =for apidoc m|char *|PAD_COMPNAME_PV|PADOFFSET po Return the name of the current compiling pad name -at offset C. Assumes a valid slot entry. +at offset C. Assumes a valid slot entry. =for apidoc m|HV *|PAD_COMPNAME_TYPE|PADOFFSET po Return the type (stash) of the current compiling pad name at offset -C. Must be a valid name. Returns null if not typed. +C. Must be a valid name. Returns null if not typed. =for apidoc m|HV *|PAD_COMPNAME_OURSTASH|PADOFFSET po Return the stash associated with an C variable. @@ -385,7 +387,7 @@ Assumes the slot entry is a valid C lexical. =for apidoc m|STRLEN|PAD_COMPNAME_GEN|PADOFFSET po The generation number of the name at offset C in the current -compiling pad (lvalue). Note that C is hijacked for this purpose. +compiling pad (lvalue). Note that C is hijacked for this purpose. =for apidoc m|STRLEN|PAD_COMPNAME_GEN_set|PADOFFSET po|int gen Sets the generation number of the name at offset C in the current @@ -396,7 +398,7 @@ ling pad (lvalue) to C. Note that C is hijacked for this purpose */ #define PAD_COMPNAME(po) PAD_COMPNAME_SV(po) -#define PAD_COMPNAME_SV(po) (*av_fetch(PL_comppad_name, (po), FALSE)) +#define PAD_COMPNAME_SV(po) (AvARRAY(PL_comppad_name)[(po)]) #define PAD_COMPNAME_FLAGS(po) SvFLAGS(PAD_COMPNAME_SV(po)) #define PAD_COMPNAME_FLAGS_isOUR(po) SvPAD_OUR(PAD_COMPNAME_SV(po)) #define PAD_COMPNAME_PV(po) SvPV_nolen(PAD_COMPNAME_SV(po))