summaryrefslogtreecommitdiff
path: root/pp_ctl.c
diff options
context:
space:
mode:
authorJarkko Hietaniemi <jhi@iki.fi>2003-09-21 09:53:49 +0000
committerJarkko Hietaniemi <jhi@iki.fi>2003-09-21 09:53:49 +0000
commitef7b71f03306026ca638a8e149b16b2a84e860b1 (patch)
treeaf4369dff9f783dc8ac38db28b765e7e0c4e3d79 /pp_ctl.c
parentfe092dd2349570b4591d451873cdccd179c5ab08 (diff)
downloadperl-ef7b71f03306026ca638a8e149b16b2a84e860b1.tar.gz
Integrate:
[ 21288] Subject: typo fixo From: Vadim Konovalov <konovalo@mail.wplus.net> Date: Fri, 19 Sep 2003 06:32:08 +0400 Message-ID: <4538131828.20030919063208@mail.wplus.net> [ 21289] FAQ sync. [ 21290] Missing perlfaq chunk. [ 21291] In FreeBSD allow one to try using Perl's malloc with threads. [ 21292] Retract #21273, #21264, and #21263 as requested by Schwern. (The real bug was mp2 being too "friendly" with MM innards.) [ 21293] More PerlIO documentation. [ 21294] Subject: [PATCH #2] Re: [perl #23576] valgrind errors for /(?{})/ in t/op/pat.t From: Dave Mitchell <davem@fdgroup.com> Date: Fri, 19 Sep 2003 19:35:44 +0100 Message-ID: <20030919183544.GA14563@fdgroup.com> [ 21295] One obvious place to look for PerlIO implementations. [ 21296] Tweak the section name to agree with the change #21295. [ 21297] Macrofy the compile/runtime test. [ 21298] Handle also the curliffy files when tocing. [ 21299] Regen toc. p4raw-link: @21299 on //depot/perl: 5538b230ca39261209d43cdc40371b2d9b9dfa11 p4raw-link: @21298 on //depot/perl: 16114dde8ca7b3eded13218a07f79301ce8c5946 p4raw-link: @21297 on //depot/perl: 923e4eb5b872f0800559dcb72be02dea329298f2 p4raw-link: @21296 on //depot/perl: 4c11337c0371dac743b0b266e8ebc6f347fa0cd9 p4raw-link: @21295 on //depot/perl: eae154c7dcbb63935731f10277d6aa4e40e86a6c p4raw-link: @21294 on //depot/perl: f120105df5a639f1ff2bfd3294f7ac263449621f p4raw-link: @21293 on //depot/perl: cc83745da206d409d7227df077f422fd9ecbe680 p4raw-link: @21292 on //depot/perl: 60537fc0fb46c1b1fbdabe01b4de45ea60c5b753 p4raw-link: @21291 on //depot/perl: 46c2c6f31cce4e252716017f4e0350b100a578a4 p4raw-link: @21290 on //depot/perl: 4dfcc30baac9af2364bced02447a6d9d74693f53 p4raw-link: @21289 on //depot/perl: 6f0efb172c82e82c39073291db2462e39dbe4104 p4raw-link: @21288 on //depot/perl: fb9cc17475f7385a07b3c8693a1ca73c68a368d6 p4raw-id: //depot/maint-5.8/perl@21300 p4raw-integrated: from //depot/perl@21287 'copy in' lib/PerlIO.pm (@19748..) pod/perliol.pod (@20499..) pod/buildtoc (@20837..) hints/freebsd.sh (@21191..) utf8.c (@21198..) pod/perlunicode.pod (@21243..) lib/ExtUtils/MM_Unix.pm lib/ExtUtils/MM_Win32.pm lib/ExtUtils/t/MM_Win32.t (@21263..) lib/ExtUtils/t/MM_Unix.t (@21273..) pod/perlfaq4.pod (@21283..) 'merge in' cop.h (@19870..) gv.c (@20805..) pp_ctl.c (@21062..) perl.h (@21140..) pod/perltoc.pod sv.c (@21198..) regcomp.c (@21210..)
Diffstat (limited to 'pp_ctl.c')
-rw-r--r--pp_ctl.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/pp_ctl.c b/pp_ctl.c
index a0143dd972..10159e2da0 100644
--- a/pp_ctl.c
+++ b/pp_ctl.c
@@ -2630,7 +2630,7 @@ Perl_sv_compile_2op(pTHX_ SV *sv, OP** startop, char *code, PAD** padp)
SAVETMPS;
/* switch to eval mode */
- if (PL_curcop == &PL_compiling) {
+ if (IN_PERL_COMPILETIME) {
SAVECOPSTASH_FREE(&PL_compiling);
CopSTASH_set(&PL_compiling, PL_curstash);
}
@@ -2663,14 +2663,14 @@ Perl_sv_compile_2op(pTHX_ SV *sv, OP** startop, char *code, PAD** padp)
PL_hints &= HINT_UTF8;
/* we get here either during compilation, or via pp_regcomp at runtime */
- runtime = PL_op && (PL_op->op_type == OP_REGCOMP);
+ runtime = IN_PERL_RUNTIME;
if (runtime)
runcv = find_runcv(NULL);
PL_op = &dummy;
PL_op->op_type = OP_ENTEREVAL;
PL_op->op_flags = 0; /* Avoid uninit warning. */
- PUSHBLOCK(cx, CXt_EVAL|(PL_curcop == &PL_compiling ? 0 : CXp_REAL), SP);
+ PUSHBLOCK(cx, CXt_EVAL|(IN_PERL_COMPILETIME ? 0 : CXp_REAL), SP);
PUSHEVAL(cx, 0, Nullgv);
if (runtime)
@@ -2686,7 +2686,7 @@ Perl_sv_compile_2op(pTHX_ SV *sv, OP** startop, char *code, PAD** padp)
/* XXX DAPM do this properly one year */
*padp = (AV*)SvREFCNT_inc(PL_comppad);
LEAVE;
- if (PL_curcop == &PL_compiling)
+ if (IN_PERL_COMPILETIME)
PL_compiling.op_private = (U8)(PL_hints & HINT_PRIVATE_MASK);
#ifdef OP_IN_REGISTER
op = PL_opsave;