diff options
| author | Father Chrysostomos <sprout@cpan.org> | 2014-11-23 14:25:22 -0800 |
|---|---|---|
| committer | Father Chrysostomos <sprout@cpan.org> | 2014-11-30 11:48:37 -0800 |
| commit | 9b7476d7a269a4d9bb24393ae5c8d75efe2fcab4 (patch) | |
| tree | 61d730354c865de902a488e7255e91ee90685438 /dump.c | |
| parent | 6bb83edb7efd3e3c04f6411141538655410c83a4 (diff) | |
| download | perl-9b7476d7a269a4d9bb24393ae5c8d75efe2fcab4.tar.gz | |
Make PADNAMELIST a separate type
This is in preparation for making PADNAME a separate type.
Diffstat (limited to 'dump.c')
| -rw-r--r-- | dump.c | 15 |
1 files changed, 4 insertions, 11 deletions
@@ -1496,7 +1496,6 @@ Perl_do_sv_dump(pTHX_ I32 level, PerlIO *file, SV *sv, I32 nest, I32 maxnest, bo if (SvPAD_STATE(sv)) sv_catpv(d, "STATE,"); goto evaled_or_uv; case SVt_PVAV: - if (AvPAD_NAMELIST(sv)) sv_catpvs(d, "NAMELIST,"); break; } /* SVphv_SHAREKEYS is also 0x20000000 */ @@ -1643,9 +1642,6 @@ Perl_do_sv_dump(pTHX_ I32 level, PerlIO *file, SV *sv, I32 nest, I32 maxnest, bo HV * const ost = SvOURSTASH(sv); if (ost) do_hv_dump(level, file, " OURSTASH", ost); - } else if (SvTYPE(sv) == SVt_PVAV && AvPAD_NAMELIST(sv)) { - Perl_dump_indent(aTHX_ level, file, " MAXNAMED = %"UVuf"\n", - (UV)PadnamelistMAXNAMED(sv)); } else { if (SvMAGIC(sv)) do_magic_dump(level, file, SvMAGIC(sv), nest+1, maxnest, dumpops, pvlim); @@ -1671,10 +1667,7 @@ Perl_do_sv_dump(pTHX_ I32 level, PerlIO *file, SV *sv, I32 nest, I32 maxnest, bo PerlIO_putc(file, '\n'); Perl_dump_indent(aTHX_ level, file, " FILL = %"IVdf"\n", (IV)AvFILLp(sv)); Perl_dump_indent(aTHX_ level, file, " MAX = %"IVdf"\n", (IV)AvMAX(sv)); - /* arylen is stored in magic, and padnamelists use SvMAGIC for - something else. */ - if (!AvPAD_NAMELIST(sv)) - Perl_dump_indent(aTHX_ level, file, " ARYLEN = 0x%"UVxf"\n", + Perl_dump_indent(aTHX_ level, file, " ARYLEN = 0x%"UVxf"\n", SvMAGIC(sv) ? PTR2UV(AvARYLEN(sv)) : 0); sv_setpvs(d, ""); if (AvREAL(sv)) sv_catpv(d, ",REAL"); @@ -2303,17 +2296,17 @@ Perl_debop(pTHX_ const OP *o) { CV * const cv = deb_curcv(cxstack_ix); SV *sv; - PAD * comppad = NULL; + PADNAMELIST * comppad = NULL; int i; if (cv) { PADLIST * const padlist = CvPADLIST(cv); - comppad = *PadlistARRAY(padlist); + comppad = PadlistNAMES(padlist); } PerlIO_printf(Perl_debug_log, "("); for (i = 0; i < count; i++) { if (comppad && - (sv = *av_fetch(comppad, o->op_targ + i, FALSE))) + (sv = padnamelist_fetch(comppad, o->op_targ + i))) PerlIO_printf(Perl_debug_log, "%s", SvPV_nolen_const(sv)); else PerlIO_printf(Perl_debug_log, "[%"UVuf"]", |