X-Git-Url: https://perl5.git.perl.org/perl5.git/blobdiff_plain/35e035ccb58e33947405288b1177fb0b9c1da197..7adaf5b2acaa653a831bb68ed91d8d205fbf9fb2:/pad.h diff --git a/pad.h b/pad.h index 05bbc62..ab46cf4 100644 --- a/pad.h +++ b/pad.h @@ -27,82 +27,94 @@ typedef U64TYPE PADOFFSET; #endif #define NOT_IN_PAD ((PADOFFSET) -1) +/* B.xs expects the first members of these two structs to line up + (xpadl_max with xpadnl_fill). + */ struct padlist { SSize_t xpadl_max; /* max index for which array has space */ - PAD ** xpadl_alloc; /* pointer to beginning of array of AVs */ + union { + PAD ** xpadlarr_alloc; /* Pointer to beginning of array of AVs. + index 0 is a padnamelist * */ + struct { + PADNAMELIST * padnl; + PAD * pad_1; /* this slice of PAD * array always alloced */ + PAD * pad_2; /* maybe unalloced */ + } * xpadlarr_dbg; /* for use with a C debugger only */ + } xpadl_arr; U32 xpadl_id; /* Semi-unique ID, shared between clones */ U32 xpadl_outid; /* ID of outer pad */ }; +struct padnamelist { + SSize_t xpadnl_fill; /* max index in use */ + PADNAME ** xpadnl_alloc; /* pointer to beginning of array */ + SSize_t xpadnl_max; /* max index for which array has space */ + PADOFFSET xpadnl_max_named; /* highest index with len > 0 */ + U32 xpadnl_refcnt; +}; + +/* PERL_PADNAME_MINIMAL uses less memory, but on some platforms + PERL_PADNAME_ALIGNED may be faster, so platform-specific hints can + define one or the other. */ +#if defined(PERL_PADNAME_MINIMAL) && defined (PERL_PADNAME_ALIGNED) +# error PERL_PADNAME_MINIMAL and PERL_PADNAME_ALIGNED are exclusive +#endif + +#if !defined(PERL_PADNAME_MINIMAL) && !defined(PERL_PADNAME_ALIGNED) +# define PERL_PADNAME_MINIMAL +#endif + +#define _PADNAME_BASE \ + char * xpadn_pv; \ + HV * xpadn_ourstash; \ + union { \ + HV * xpadn_typestash; \ + CV * xpadn_protocv; \ + } xpadn_type_u; \ + U32 xpadn_low; \ + U32 xpadn_high; \ + U32 xpadn_refcnt; \ + int xpadn_gen; \ + U8 xpadn_len; \ + U8 xpadn_flags + +struct padname { + _PADNAME_BASE; +}; + +struct padname_with_str { +#ifdef PERL_PADNAME_MINIMAL + _PADNAME_BASE; +#else + struct padname xpadn_padname; +#endif + char xpadn_str[1]; +}; + +#undef _PADNAME_BASE + +#define PADNAME_FROM_PV(s) \ + ((PADNAME *)((s) - STRUCT_OFFSET(struct padname_with_str, xpadn_str))) + /* a value that PL_cop_seqmax is guaranteed never to be, * flagging that a lexical is being introduced, or has not yet left scope */ #define PERL_PADSEQ_INTRO U32_MAX +#define COP_SEQMAX_INC \ + (PL_cop_seqmax++, \ + (void)(PL_cop_seqmax == PERL_PADSEQ_INTRO && PL_cop_seqmax++)) /* B.xs needs these for the benefit of B::Deparse */ /* Low range end is exclusive (valid from the cop seq after this one) */ /* High range end is inclusive (valid up to this cop seq) */ -#if defined (DEBUGGING) && defined(__GNUC__) && !defined(PERL_GCC_BRACE_GROUPS_FORBIDDEN) -# define COP_SEQ_RANGE_LOW(sv) \ - (({ const SV *const _sv_cop_seq_range_low = (const SV *) (sv); \ - assert(SvTYPE(_sv_cop_seq_range_low) == SVt_NV \ - || SvTYPE(_sv_cop_seq_range_low) >= SVt_PVNV); \ - assert(SvTYPE(_sv_cop_seq_range_low) != SVt_PVAV); \ - assert(SvTYPE(_sv_cop_seq_range_low) != SVt_PVHV); \ - assert(SvTYPE(_sv_cop_seq_range_low) != SVt_PVCV); \ - assert(SvTYPE(_sv_cop_seq_range_low) != SVt_PVFM); \ - assert(!isGV_with_GP(_sv_cop_seq_range_low)); \ - ((XPVNV*) MUTABLE_PTR(SvANY(_sv_cop_seq_range_low)))->xnv_u.xpad_cop_seq.xlow; \ - })) -# define COP_SEQ_RANGE_HIGH(sv) \ - (({ const SV *const _sv_cop_seq_range_high = (const SV *) (sv); \ - assert(SvTYPE(_sv_cop_seq_range_high) == SVt_NV \ - || SvTYPE(_sv_cop_seq_range_high) >= SVt_PVNV); \ - assert(SvTYPE(_sv_cop_seq_range_high) != SVt_PVAV); \ - assert(SvTYPE(_sv_cop_seq_range_high) != SVt_PVHV); \ - assert(SvTYPE(_sv_cop_seq_range_high) != SVt_PVCV); \ - assert(SvTYPE(_sv_cop_seq_range_high) != SVt_PVFM); \ - assert(!isGV_with_GP(_sv_cop_seq_range_high)); \ - ((XPVNV*) MUTABLE_PTR(SvANY(_sv_cop_seq_range_high)))->xnv_u.xpad_cop_seq.xhigh; \ - })) -# define PARENT_PAD_INDEX(sv) \ - (({ const SV *const _sv_parent_pad_index = (const SV *) (sv); \ - assert(SvTYPE(_sv_parent_pad_index) == SVt_NV \ - || SvTYPE(_sv_parent_pad_index) >= SVt_PVNV); \ - assert(SvTYPE(_sv_parent_pad_index) != SVt_PVAV); \ - assert(SvTYPE(_sv_parent_pad_index) != SVt_PVHV); \ - assert(SvTYPE(_sv_parent_pad_index) != SVt_PVCV); \ - assert(SvTYPE(_sv_parent_pad_index) != SVt_PVFM); \ - assert(!isGV_with_GP(_sv_parent_pad_index)); \ - ((XPVNV*) MUTABLE_PTR(SvANY(_sv_parent_pad_index)))->xnv_u.xpad_cop_seq.xlow; \ - })) -# define PARENT_FAKELEX_FLAGS(sv) \ - (({ const SV *const _sv_parent_fakelex_flags = (const SV *) (sv); \ - assert(SvTYPE(_sv_parent_fakelex_flags) == SVt_NV \ - || SvTYPE(_sv_parent_fakelex_flags) >= SVt_PVNV); \ - assert(SvTYPE(_sv_parent_fakelex_flags) != SVt_PVAV); \ - assert(SvTYPE(_sv_parent_fakelex_flags) != SVt_PVHV); \ - assert(SvTYPE(_sv_parent_fakelex_flags) != SVt_PVCV); \ - assert(SvTYPE(_sv_parent_fakelex_flags) != SVt_PVFM); \ - assert(!isGV_with_GP(_sv_parent_fakelex_flags)); \ - ((XPVNV*) MUTABLE_PTR(SvANY(_sv_parent_fakelex_flags)))->xnv_u.xpad_cop_seq.xhigh; \ - })) -#else -# define COP_SEQ_RANGE_LOW(sv) \ - (0 + (((XPVNV*) SvANY(sv))->xnv_u.xpad_cop_seq.xlow)) -# define COP_SEQ_RANGE_HIGH(sv) \ - (0 + (((XPVNV*) SvANY(sv))->xnv_u.xpad_cop_seq.xhigh)) - - -# define PARENT_PAD_INDEX(sv) \ - (0 + (((XPVNV*) SvANY(sv))->xnv_u.xpad_cop_seq.xlow)) -# define PARENT_FAKELEX_FLAGS(sv) \ - (0 + (((XPVNV*) SvANY(sv))->xnv_u.xpad_cop_seq.xhigh)) -#endif +#define COP_SEQ_RANGE_LOW(pn) (pn)->xpadn_low +#define COP_SEQ_RANGE_HIGH(pn) (pn)->xpadn_high +#define PARENT_PAD_INDEX(pn) (pn)->xpadn_low +#define PARENT_FAKELEX_FLAGS(pn) (pn)->xpadn_high /* Flags set in the SvIVX field of FAKE namesvs */ @@ -130,28 +142,25 @@ typedef enum { #define padadd_NO_DUP_CHECK 0x04 /* skip warning on dups. */ #define padadd_STALEOK 0x08 /* allow stale lexical in active * sub, but only one level up */ -#define padadd_UTF8_NAME SVf_UTF8 /* name is UTF-8 encoded. */ /* ASSERT_CURPAD_LEGAL and ASSERT_CURPAD_ACTIVE respectively determine * 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,67 +178,93 @@ 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 -=for apidoc Amx|PAD **|PADLIST_ARRAY|PADLIST padlist +=for apidoc Amx|PAD **|PadlistARRAY|PADLIST padlist 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|PADLIST_MAX|PADLIST padlist -The index of the last pad in the padlist. +=for apidoc Amx|SSize_t|PadlistMAX|PADLIST 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 *|PADLIST_NAMES|PADLIST padlist +=for apidoc Amx|PADNAMELIST *|PadlistNAMES|PADLIST padlist The names associated with pad entries. -=for apidoc Amx|PADNAME **|PADLIST_NAMESARRAY|PADLIST padlist +=for apidoc Amx|PADNAME **|PadlistNAMESARRAY|PADLIST padlist The C array of pad names. -=for apidoc Amx|SSize_t|PADLIST_NAMESMAX|PADLIST padlist +=for apidoc Amx|SSize_t|PadlistNAMESMAX|PADLIST padlist The index of the last pad name. -=for apidoc Amx|U32|PADLIST_REFCNT|PADLIST padlist +=for apidoc Amx|U32|PadlistREFCNT|PADLIST padlist The reference count of the padlist. Currently this is always 1. -=for apidoc Amx|PADNAME **|PADNAMELIST_ARRAY|PADNAMELIST pnl +=for apidoc Amx|PADNAME **|PadnamelistARRAY|PADNAMELIST pnl The C array of pad names. -=for apidoc Amx|SSize_t|PADNAMELIST_MAX|PADNAMELIST pnl +=for apidoc Amx|SSize_t|PadnamelistMAX|PADNAMELIST pnl The index of the last pad name. -=for apidoc Amx|SV **|PAD_ARRAY|PAD pad +=for apidoc Amx|SSize_t|PadnamelistREFCNT|PADNAMELIST pnl +The reference count of the pad name list. + +=for apidoc Amx|void|PadnamelistREFCNT_dec|PADNAMELIST pnl +Lowers the reference count of the pad name list. + +=for apidoc Amx|SV **|PadARRAY|PAD pad The C array of pad entries. -=for apidoc Amx|SSize_t|PAD_MAX|PAD pad +=for apidoc Amx|SSize_t|PadMAX|PAD pad The index of the last pad entry. -=for apidoc Amx|char *|PADNAME_PV|PADNAME pn -The name stored in the pad name struct. +=for apidoc Amx|char *|PadnamePV|PADNAME pn +The name stored in the pad name struct. This returns NULL for a target +slot. -=for apidoc Amx|STRLEN|PADNAME_LEN|PADNAME pn +=for apidoc Amx|STRLEN|PadnameLEN|PADNAME pn The length of the name. -=for apidoc Amx|bool|PADNAME_UTF8|PADNAME pn -Whether PADNAME_PV is in UTF8. +=for apidoc Amx|bool|PadnameUTF8|PADNAME pn +Whether PadnamePV is in UTF8. Currently, this is always true. + +=for apidoc Amx|SV *|PadnameSV|PADNAME pn +Returns the pad name as a mortal SV. -=for apidoc m|bool|PADNAME_isOUR|PADNAME pn +=for apidoc m|bool|PadnameIsOUR|PADNAME pn Whether this is an "our" variable. -=for apidoc m|HV *|PADNAME_OURSTASH +=for apidoc m|HV *|PadnameOURSTASH The stash in which this "our" variable was declared. -=for apidoc m|HV *|PADNAME_TYPE|PADNAME pn +=for apidoc m|bool|PadnameOUTER|PADNAME pn +Whether this entry belongs to an outer pad. Entries for which this is true +are often referred to as 'fake'. + +=for apidoc m|bool|PadnameIsSTATE|PADNAME pn +Whether this is a "state" variable. + +=for apidoc m|HV *|PadnameTYPE|PADNAME pn The stash associated with a typed lexical. This returns the %Foo:: hash for C. +=for apidoc Amx|SSize_t|PadnameREFCNT|PADNAME pn +The reference count of the pad name. + +=for apidoc Amx|void|PadnameREFCNT_dec|PADNAME pn +Lowers the reference count of the pad name. + =for apidoc m|SV *|PAD_SETSV |PADOFFSET po|SV* sv Set the slot at offset C in the current pad to C -=for apidoc m|void|PAD_SV |PADOFFSET po +=for apidoc m|SV *|PAD_SV |PADOFFSET po Get the value at offset C in the current pad =for apidoc m|SV *|PAD_SVl |PADOFFSET po @@ -243,7 +278,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(); @@ -266,26 +301,61 @@ Restore the old pad saved into the local variable opad by PAD_SAVE_LOCAL() =cut */ -#define PADLIST_ARRAY(pl) (pl)->xpadl_alloc -#define PADLIST_MAX(pl) (pl)->xpadl_max -#define PADLIST_NAMES(pl) (*PADLIST_ARRAY(pl)) -#define PADLIST_NAMESARRAY(pl) PADNAMELIST_ARRAY(PADLIST_NAMES(pl)) -#define PADLIST_NAMESMAX(pl) PADNAMELIST_MAX(PADLIST_NAMES(pl)) -#define PADLIST_REFCNT(pl) 1 /* reserved for future use */ - -#define PADNAMELIST_ARRAY(pnl) AvARRAY(pnl) -#define PADNAMELIST_MAX(pnl) AvFILLp(pnl) - -#define PAD_ARRAY(pad) AvARRAY(pad) -#define PAD_MAX(pad) AvFILLp(pad) - -#define PADNAME_PV(pn) SvPV_nolen(pn) -#define PADNAME_LEN(pn) SvCUR(pn) -#define PADNAME_UTF8(pn) !!SvUTF8(pn) -#define PADNAME_isOUR(pn) !!SvPAD_OUR(pn) -#define PADNAME_OURSTASH SvOURSTASH(pn) -#define PADNAME_TYPE(pn) (SvPAD_TYPED(pn) ? SvSTASH(pn) : NULL) - +#define PadlistARRAY(pl) (pl)->xpadl_arr.xpadlarr_alloc +#define PadlistMAX(pl) (pl)->xpadl_max +#define PadlistNAMES(pl) *((PADNAMELIST **)PadlistARRAY(pl)) +#define PadlistNAMESARRAY(pl) PadnamelistARRAY(PadlistNAMES(pl)) +#define PadlistNAMESMAX(pl) PadnamelistMAX(PadlistNAMES(pl)) +#define PadlistREFCNT(pl) 1 /* reserved for future use */ + +#define PadnamelistARRAY(pnl) (pnl)->xpadnl_alloc +#define PadnamelistMAX(pnl) (pnl)->xpadnl_fill +#define PadnamelistMAXNAMED(pnl) (pnl)->xpadnl_max_named +#define PadnamelistREFCNT(pnl) (pnl)->xpadnl_refcnt +#define PadnamelistREFCNT_dec(pnl) Perl_padnamelist_free(aTHX_ pnl) + +#define PadARRAY(pad) AvARRAY(pad) +#define PadMAX(pad) AvFILLp(pad) + +#define PadnamePV(pn) (pn)->xpadn_pv +#define PadnameLEN(pn) (pn)->xpadn_len +#define PadnameUTF8(pn) 1 +#define PadnameSV(pn) \ + newSVpvn_flags(PadnamePV(pn), PadnameLEN(pn), SVs_TEMP|SVf_UTF8) +#define PadnameFLAGS(pn) (pn)->xpadn_flags +#define PadnameIsOUR(pn) (!!(pn)->xpadn_ourstash) +#define PadnameOURSTASH(pn) (pn)->xpadn_ourstash +#define PadnameTYPE(pn) (pn)->xpadn_type_u.xpadn_typestash +#define PadnamePROTOCV(pn) (pn)->xpadn_type_u.xpadn_protocv +#define PadnameREFCNT(pn) (pn)->xpadn_refcnt +#define PadnameREFCNT_dec(pn) Perl_padname_free(aTHX_ pn) +#define PadnameOURSTASH_set(pn,s) (PadnameOURSTASH(pn) = (s)) +#define PadnameTYPE_set(pn,s) (PadnameTYPE(pn) = (s)) +#define PadnameOUTER(pn) (PadnameFLAGS(pn) & PADNAMEt_OUTER) +#define PadnameIsSTATE(pn) (PadnameFLAGS(pn) & PADNAMEt_STATE) +#define PadnameLVALUE(pn) (PadnameFLAGS(pn) & PADNAMEt_LVALUE) + +#define PadnameLVALUE_on(pn) (PadnameFLAGS(pn) |= PADNAMEt_LVALUE) +#define PadnameIsSTATE_on(pn) (PadnameFLAGS(pn) |= PADNAMEt_STATE) + +#define PADNAMEt_OUTER 1 /* outer lexical var */ +#define PADNAMEt_STATE 2 /* state var */ +#define PADNAMEt_LVALUE 4 /* used as lvalue */ +#define PADNAMEt_TYPED 8 /* for B; unused by core */ +#define PADNAMEt_OUR 16 /* for B; unused by core */ + +/* backward compatibility */ +#define SvPAD_STATE PadnameIsSTATE +#define SvPAD_TYPED(pn) (!!PadnameTYPE(pn)) +#define SvPAD_OUR(pn) (!!PadnameOURSTASH(pn)) +#define SvPAD_STATE_on PadnameIsSTATE_on +#define SvPAD_TYPED_on(pn) (PadnameFLAGS(pn) |= PADNAMEt_TYPED) +#define SvPAD_OUR_on(pn) (PadnameFLAGS(pn) |= PADNAMEt_OUR) +#define SvOURSTASH PadnameOURSTASH +#define SvOURSTASH_set PadnameOURSTASH_set +#define SVpad_STATE PADNAMEt_STATE +#define SVpad_TYPED PADNAMEt_TYPED +#define SVpad_OUR PADNAMEt_OUR #ifdef DEBUGGING # define PAD_SV(po) pad_sv(po) @@ -298,16 +368,16 @@ Restore the old pad saved into the local variable opad by PAD_SAVE_LOCAL() #define PAD_SVl(po) (PL_curpad[po]) #define PAD_BASE_SV(padlist, po) \ - (PADLIST_ARRAY(padlist)[1]) \ - ? AvARRAY(MUTABLE_AV((PADLIST_ARRAY(padlist)[1])))[po] \ + (PadlistARRAY(padlist)[1]) \ + ? AvARRAY(MUTABLE_AV((PadlistARRAY(padlist)[1])))[po] \ : NULL; #define PAD_SET_CUR_NOSAVE(padlist,nth) \ - PL_comppad = (PAD*) (PADLIST_ARRAY(padlist)[nth]); \ + 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))); @@ -325,7 +395,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) \ @@ -333,7 +403,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))); @@ -355,15 +425,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. @@ -371,30 +441,31 @@ 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). =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 -ling pad (lvalue) to C. Note that C is hijacked for this purpose. - +ling pad (lvalue) to C. =cut */ #define PAD_COMPNAME(po) PAD_COMPNAME_SV(po) -#define PAD_COMPNAME_SV(po) (*av_fetch(PL_comppad_name, (po), FALSE)) -#define PAD_COMPNAME_FLAGS(po) SvFLAGS(PAD_COMPNAME_SV(po)) +#define PAD_COMPNAME_SV(po) (PadnamelistARRAY(PL_comppad_name)[(po)]) +#define PAD_COMPNAME_FLAGS(po) PadnameFLAGS(PAD_COMPNAME(po)) #define PAD_COMPNAME_FLAGS_isOUR(po) SvPAD_OUR(PAD_COMPNAME_SV(po)) -#define PAD_COMPNAME_PV(po) SvPV_nolen(PAD_COMPNAME_SV(po)) +#define PAD_COMPNAME_PV(po) PadnamePV(PAD_COMPNAME(po)) -#define PAD_COMPNAME_TYPE(po) pad_compname_type(po) +#define PAD_COMPNAME_TYPE(po) PadnameTYPE(PAD_COMPNAME(po)) #define PAD_COMPNAME_OURSTASH(po) \ (SvOURSTASH(PAD_COMPNAME_SV(po))) -#define PAD_COMPNAME_GEN(po) ((STRLEN)SvUVX(AvARRAY(PL_comppad_name)[po])) +#define PAD_COMPNAME_GEN(po) \ + ((STRLEN)PadnamelistARRAY(PL_comppad_name)[po]->xpadn_gen) -#define PAD_COMPNAME_GEN_set(po, gen) SvUV_set(AvARRAY(PL_comppad_name)[po], (UV)(gen)) +#define PAD_COMPNAME_GEN_set(po, gen) \ + (PadnamelistARRAY(PL_comppad_name)[po]->xpadn_gen = (gen)) /* @@ -415,7 +486,8 @@ Clone the state variables associated with running and compiling pads. #define PAD_CLONE_VARS(proto_perl, param) \ PL_comppad = av_dup(proto_perl->Icomppad, param); \ PL_curpad = PL_comppad ? AvARRAY(PL_comppad) : NULL; \ - PL_comppad_name = av_dup(proto_perl->Icomppad_name, param); \ + PL_comppad_name = \ + padnamelist_dup(proto_perl->Icomppad_name, param); \ PL_comppad_name_fill = proto_perl->Icomppad_name_fill; \ PL_comppad_name_floor = proto_perl->Icomppad_name_floor; \ PL_min_intro_pending = proto_perl->Imin_intro_pending; \ @@ -450,11 +522,5 @@ of a string/length pair. Perl_pad_findmy_pvn(aTHX_ STR_WITH_LEN(name), flags) /* - * Local variables: - * c-indentation-style: bsd - * c-basic-offset: 4 - * indent-tabs-mode: nil - * End: - * * ex: set ts=8 sts=4 sw=4 et: */