X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=cop.h;h=baedc5a52d13d3fee0a0b9dc3b39aa5828ff0341;hb=720cbd8665fdedebd0f7cae0dc4967e04f04a521;hp=0b1868b6317e9bea1370983dbe03f995c327a534;hpb=463ee0b2acbd047c27e8b5393cdd8398881824c5;p=p5sagit%2Fp5-mst-13.2.git diff --git a/cop.h b/cop.h index 0b1868b..baedc5a 100644 --- a/cop.h +++ b/cop.h @@ -1,61 +1,20 @@ -/* $RCSfile: cmd.h,v $$Revision: 4.1 $$Date: 92/08/07 17:19:19 $ +/* cop.h * - * Copyright (c) 1991, Larry Wall + * Copyright (c) 1991-1997, 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. * - * $Log: cmd.h,v $ - * Revision 4.1 92/08/07 17:19:19 lwall - * Stage 6 Snapshot - * - * Revision 4.0.1.2 92/06/08 12:01:02 lwall - * patch20: removed implicit int declarations on funcions - * - * Revision 4.0.1.1 91/06/07 10:28:50 lwall - * patch4: new copyright notice - * patch4: length($`), length($&), length($') now optimized to avoid string copy - * - * Revision 4.0 91/03/20 01:04:34 lwall - * 4.0 baseline. - * */ -struct acop { - GV *acop_gv; /* a symbol table entry */ - OP *acop_expr; /* any associated expression */ -}; - -struct ccop { - OP *ccop_true; /* normal code to do on if and while */ - OP *ccop_alt; /* else cmd ptr or continue code */ -}; - -struct scop { - OP **scop_next; /* array of pointers to commands */ - short scop_offset; /* first value - 1 */ - short scop_max; /* last value + 1 */ -}; - struct cop { BASEOP - OP *cop_expr; /* conditional expression */ - OP *cop_head; /* head of this command list */ - SV *cop_short; /* string to match as shortcut */ - GV *cop_gv; /* a symbol table entry, mostly for fp */ - char *cop_label; /* label for this construct */ - union uop { - struct acop acop; /* normal command */ - struct ccop ccop; /* compound command */ - struct scop scop; /* switch command */ - } uop; - U32 cop_seq; /* parse sequence number */ - short cop_slen; /* len of cop_short, if not null */ - VOL short cop_flags; /* optimization flags--see above */ + char * cop_label; /* label for this construct */ HV * cop_stash; /* package line was compiled in */ GV * cop_filegv; /* file the following line # is from */ + U32 cop_seq; /* parse sequence number */ + I32 cop_arybase; /* array base this line was compiled with */ line_t cop_line; /* line # of this command */ - char cop_type; /* what this command does */ }; #define Nullcop Null(COP*) @@ -71,35 +30,47 @@ struct block_sub { GV * dfoutgv; AV * savearray; AV * argarray; - AV * comppad; U16 olddepth; U8 hasargs; }; #define PUSHSUB(cx) \ cx->blk_sub.cv = cv; \ - cx->blk_sub.gv = gv; \ cx->blk_sub.olddepth = CvDEPTH(cv); \ cx->blk_sub.hasargs = hasargs; #define PUSHFORMAT(cx) \ cx->blk_sub.cv = cv; \ cx->blk_sub.gv = gv; \ + cx->blk_sub.hasargs = 0; \ cx->blk_sub.dfoutgv = defoutgv; \ - cx->blk_sub.hasargs = 0; + (void)SvREFCNT_inc(cx->blk_sub.dfoutgv) #define POPSUB(cx) \ - if (cx->blk_sub.hasargs) { /* put back old @_ */ \ - av_free(cx->blk_sub.argarray); \ - GvAV(defgv) = cx->blk_sub.savearray; \ + { struct block_sub cxsub; \ + POPSUB1(cx); \ + POPSUB2(); } + +#define POPSUB1(cx) \ + cxsub = cx->blk_sub; /* because DESTROY may clobber *cx */ + +#define POPSUB2() \ + if (cxsub.hasargs) { \ + /* put back old @_ */ \ + SvREFCNT_dec(GvAV(defgv)); \ + GvAV(defgv) = cxsub.savearray; \ + /* destroy arg array */ \ + av_clear(cxsub.argarray); \ + AvREAL_off(cxsub.argarray); \ } \ - if (!(CvDEPTH(cx->blk_sub.cv) = cx->blk_sub.olddepth)) { \ - if (CvDELETED(cx->blk_sub.cv)) \ - sv_free((SV*)cx->blk_sub.cv); \ + if (cxsub.cv) { \ + if (!(CvDEPTH(cxsub.cv) = cxsub.olddepth)) \ + SvREFCNT_dec(cxsub.cv); \ } #define POPFORMAT(cx) \ - defoutgv = cx->blk_sub.dfoutgv; + setdefout(cx->blk_sub.dfoutgv); \ + SvREFCNT_dec(cx->blk_sub.dfoutgv); /* eval context */ struct block_eval { @@ -107,13 +78,15 @@ struct block_eval { I32 old_op_type; char * old_name; OP * old_eval_root; + SV * cur_text; }; -#define PUSHEVAL(cx,n) \ +#define PUSHEVAL(cx,n,fgv) \ cx->blk_eval.old_in_eval = in_eval; \ cx->blk_eval.old_op_type = op->op_type; \ cx->blk_eval.old_name = n; \ - cx->blk_eval.old_eval_root = eval_root; + cx->blk_eval.old_eval_root = eval_root; \ + cx->blk_eval.cur_text = linestr; #define POPEVAL(cx) \ in_eval = cx->blk_eval.old_in_eval; \ @@ -129,6 +102,7 @@ struct block_loop { OP * last_op; SV ** itervar; SV * itersave; + SV * iterlval; AV * iterary; I32 iterix; }; @@ -139,14 +113,29 @@ struct block_loop { cx->blk_loop.redo_op = cLOOP->op_redoop; \ cx->blk_loop.next_op = cLOOP->op_nextop; \ cx->blk_loop.last_op = cLOOP->op_lastop; \ - cx->blk_loop.itervar = ivar; \ - if (ivar) \ - cx->blk_loop.itersave = *cx->blk_loop.itervar; + if (cx->blk_loop.itervar = (ivar)) \ + cx->blk_loop.itersave = SvREFCNT_inc(*cx->blk_loop.itervar);\ + cx->blk_loop.iterlval = Nullsv; \ + cx->blk_loop.iterary = Nullav; \ + cx->blk_loop.iterix = -1; #define POPLOOP(cx) \ - newsp = stack_base + cx->blk_loop.resetsp; \ - if (cx->blk_loop.itervar) \ - *cx->blk_loop.itervar = cx->blk_loop.itersave; + { struct block_loop cxloop; \ + POPLOOP1(cx); \ + POPLOOP2(); } + +#define POPLOOP1(cx) \ + cxloop = cx->blk_loop; /* because DESTROY may clobber *cx */ \ + newsp = stack_base + cxloop.resetsp; + +#define POPLOOP2() \ + SvREFCNT_dec(cxloop.iterlval); \ + if (cxloop.itervar) { \ + SvREFCNT_dec(*cxloop.itervar); \ + *cxloop.itervar = cxloop.itersave; \ + } \ + if (cxloop.iterary && cxloop.iterary != curstack) \ + SvREFCNT_dec(cxloop.iterary); /* context common to subroutines, evals and loops */ struct block { @@ -176,31 +165,29 @@ struct block { #define blk_loop cx_u.cx_blk.blk_u.blku_loop /* Enter a block. */ -#define PUSHBLOCK(cx,t,s) CXINC, cx = &cxstack[cxstack_ix], \ +#define PUSHBLOCK(cx,t,sp) CXINC, cx = &cxstack[cxstack_ix], \ cx->cx_type = t, \ - cx->blk_oldsp = s - stack_base, \ + cx->blk_oldsp = sp - stack_base, \ cx->blk_oldcop = curcop, \ cx->blk_oldmarksp = markstack_ptr - markstack, \ cx->blk_oldscopesp = scopestack_ix, \ cx->blk_oldretsp = retstack_ix, \ cx->blk_oldpm = curpm, \ cx->blk_gimme = gimme; \ - if (debug & 4) \ - fprintf(stderr,"Entering block %d, type %d\n", \ - cxstack_ix, t); + DEBUG_l( PerlIO_printf(PerlIO_stderr(), "Entering block %ld, type %s\n", \ + (long)cxstack_ix, block_type[t]); ) /* Exit a block (RETURN and LAST). */ -#define POPBLOCK(cx) cx = &cxstack[cxstack_ix--], \ +#define POPBLOCK(cx,pm) cx = &cxstack[cxstack_ix--], \ newsp = stack_base + cx->blk_oldsp, \ curcop = cx->blk_oldcop, \ markstack_ptr = markstack + cx->blk_oldmarksp, \ scopestack_ix = cx->blk_oldscopesp, \ retstack_ix = cx->blk_oldretsp, \ - curpm = cx->blk_oldpm, \ + pm = cx->blk_oldpm, \ gimme = cx->blk_gimme; \ - if (debug & 4) \ - fprintf(stderr,"Leaving block %d, type %d\n", \ - cxstack_ix+1,cx->cx_type); + DEBUG_l( PerlIO_printf(PerlIO_stderr(), "Leaving block %ld, type %s\n", \ + (long)cxstack_ix+1,block_type[cx->cx_type]); ) /* Continue a block elsewhere (NEXT and REDO). */ #define TOPBLOCK(cx) cx = &cxstack[cxstack_ix], \ @@ -214,41 +201,53 @@ struct subst { I32 sbu_iters; I32 sbu_maxiters; I32 sbu_safebase; - I32 sbu_once; + I32 sbu_oldsave; + bool sbu_once; + bool sbu_rxtainted; char * sbu_orig; SV * sbu_dstr; SV * sbu_targ; char * sbu_s; char * sbu_m; char * sbu_strend; - char * sbu_subbase; + void * sbu_rxres; + REGEXP * sbu_rx; }; #define sb_iters cx_u.cx_subst.sbu_iters #define sb_maxiters cx_u.cx_subst.sbu_maxiters #define sb_safebase cx_u.cx_subst.sbu_safebase +#define sb_oldsave cx_u.cx_subst.sbu_oldsave #define sb_once cx_u.cx_subst.sbu_once +#define sb_rxtainted cx_u.cx_subst.sbu_rxtainted #define sb_orig cx_u.cx_subst.sbu_orig #define sb_dstr cx_u.cx_subst.sbu_dstr #define sb_targ cx_u.cx_subst.sbu_targ #define sb_s cx_u.cx_subst.sbu_s #define sb_m cx_u.cx_subst.sbu_m #define sb_strend cx_u.cx_subst.sbu_strend -#define sb_subbase cx_u.cx_subst.sbu_subbase +#define sb_rxres cx_u.cx_subst.sbu_rxres +#define sb_rx cx_u.cx_subst.sbu_rx #define PUSHSUBST(cx) CXINC, cx = &cxstack[cxstack_ix], \ cx->sb_iters = iters, \ cx->sb_maxiters = maxiters, \ cx->sb_safebase = safebase, \ + cx->sb_oldsave = oldsave, \ cx->sb_once = once, \ + cx->sb_rxtainted = rxtainted, \ cx->sb_orig = orig, \ cx->sb_dstr = dstr, \ cx->sb_targ = targ, \ cx->sb_s = s, \ cx->sb_m = m, \ cx->sb_strend = strend, \ - cx->cx_type = CXt_SUBST + cx->sb_rxres = Null(void*), \ + cx->sb_rx = rx, \ + cx->cx_type = CXt_SUBST; \ + rxres_save(&cx->sb_rxres, rx) -#define POPSUBST(cx) cxstack_ix-- +#define POPSUBST(cx) cx = &cxstack[cxstack_ix--]; \ + rxres_free(&cx->sb_rxres) struct context { I32 cx_type; /* what kind of context this is */ @@ -267,6 +266,12 @@ struct context { #define CXINC (cxstack_ix < cxstack_max ? ++cxstack_ix : (cxstack_ix = cxinc())) /* "gimme" values */ -#define G_SCALAR 0 -#define G_ARRAY 1 +#define G_SCALAR 0 +#define G_ARRAY 1 +#define G_VOID 128 /* skip this bit when adding flags below */ +/* extra flags for perl_call_* routines */ +#define G_DISCARD 2 /* Call FREETMPS. */ +#define G_EVAL 4 /* Assume eval {} around subroutine call. */ +#define G_NOARGS 8 /* Don't construct a @_ array. */ +#define G_KEEPERR 16 /* Append errors to $@, don't overwrite it */