diff options
| author | Todd C. Miller <millert@cvs.openbsd.org> | 2001-05-24 18:36:42 +0000 |
|---|---|---|
| committer | Todd C. Miller <millert@cvs.openbsd.org> | 2001-05-24 18:36:42 +0000 |
| commit | 8bab8b19946f98d4be49345ca9c42e56674b65fb (patch) | |
| tree | bd62d7b5d463fab205d08914b30ba647eb3c8bc8 /gnu/usr.bin/perl/run.c | |
| parent | 483d4e680bd2a6db14835b1b4d65be33488d532b (diff) | |
merge in perl 5.6.1 with our local changes
Diffstat (limited to 'gnu/usr.bin/perl/run.c')
| -rw-r--r-- | gnu/usr.bin/perl/run.c | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/gnu/usr.bin/perl/run.c b/gnu/usr.bin/perl/run.c index 728b761ff03..1b1e72b1a6c 100644 --- a/gnu/usr.bin/perl/run.c +++ b/gnu/usr.bin/perl/run.c @@ -1,6 +1,6 @@ /* run.c * - * Copyright (c) 1991-2000, Larry Wall + * Copyright (c) 1991-2001, 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. @@ -20,8 +20,6 @@ int Perl_runops_standard(pTHX) { - dTHR; - while ((PL_op = CALL_FPTR(PL_op->op_ppaddr)(aTHX))) { PERL_ASYNC_CHECK(); } @@ -34,7 +32,6 @@ int Perl_runops_debug(pTHX) { #ifdef DEBUGGING - dTHR; if (!PL_op) { if (ckWARN_d(WARN_DEBUGGING)) Perl_warner(aTHX_ WARN_DEBUGGING, "NULL OP IN RUN"); @@ -67,6 +64,7 @@ Perl_debop(pTHX_ OP *o) { #ifdef DEBUGGING SV *sv; + SV **svp; STRLEN n_a; Perl_deb(aTHX_ "%s", PL_op_name[o->op_type]); switch (o->op_type) { @@ -84,6 +82,16 @@ Perl_debop(pTHX_ OP *o) else PerlIO_printf(Perl_debug_log, "(NULL)"); break; + case OP_PADSV: + case OP_PADAV: + case OP_PADHV: + /* print the lexical's name */ + svp = av_fetch(PL_comppad_name, o->op_targ, FALSE); + if (svp) + PerlIO_printf(Perl_debug_log, "(%s)", SvPV(*svp,n_a)); + else + PerlIO_printf(Perl_debug_log, "[%"UVuf"]", (UV)o->op_targ); + break; default: break; } @@ -96,7 +104,6 @@ void Perl_watch(pTHX_ char **addr) { #ifdef DEBUGGING - dTHR; PL_watchaddr = addr; PL_watchok = *addr; PerlIO_printf(Perl_debug_log, "WATCHING, %"UVxf" is currently %"UVxf"\n", |