X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=op.h;h=67e636f79e86d6920fcfb82dbdfcfb90ae9c98b0;hb=0f27ced10277587fa0b28dfb8021d0d6a60aa18b;hp=559f55c0fcad7c1c9b1df00f9f8ed29dad960450;hpb=a0d0e21ea6ea90a22318550944fe6cb09ae10cda;p=p5sagit%2Fp5-mst-13.2.git diff --git a/op.h b/op.h index 559f55c..67e636f 100644 --- a/op.h +++ b/op.h @@ -1,6 +1,6 @@ /* op.h * - * Copyright (c) 1991-1994, Larry Wall + * Copyright (c) 1991-1999, 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. @@ -23,29 +23,43 @@ * which may or may not check number of children). */ -typedef U16 PADOFFSET; +typedef U32 PADOFFSET; +#define NOT_IN_PAD ((PADOFFSET) -1) -#ifdef DEBUGGING +#ifdef DEBUGGING_OPS #define OPCODE opcode #else #define OPCODE U16 #endif +#ifdef BASEOP_DEFINITION +#define BASEOP BASEOP_DEFINITION +#else #define BASEOP \ OP* op_next; \ OP* op_sibling; \ - OP* (*op_ppaddr)(); \ + OP* (CPERLscope(*op_ppaddr))_((ARGSproto)); \ PADOFFSET op_targ; \ OPCODE op_type; \ U16 op_seq; \ U8 op_flags; \ U8 op_private; +#endif -#define GIMME (op->op_flags & OPf_KNOW ? op->op_flags & OPf_LIST : cxstack[cxstack_ix].blk_gimme & G_ARRAY) +#define OP_GIMME(op,dfl) \ + (((op)->op_flags & OPf_WANT) == OPf_WANT_VOID ? G_VOID : \ + ((op)->op_flags & OPf_WANT) == OPf_WANT_SCALAR ? G_SCALAR : \ + ((op)->op_flags & OPf_WANT) == OPf_WANT_LIST ? G_ARRAY : \ + dfl) + +#define GIMME_V OP_GIMME(PL_op, block_gimme()) /* Public flags */ -#define OPf_LIST 1 /* Do operator in list context. */ -#define OPf_KNOW 2 /* Context is known. */ + +#define OPf_WANT 3 /* Mask for "want" bits: */ +#define OPf_WANT_VOID 1 /* Want nothing */ +#define OPf_WANT_SCALAR 2 /* Want single value */ +#define OPf_WANT_LIST 3 /* Want list of any length */ #define OPf_KIDS 4 /* There is a firstborn child. */ #define OPf_PARENS 8 /* This operator was parenthesized. */ /* (Or block needs explicit scope entry.) */ @@ -63,6 +77,18 @@ typedef U16 PADOFFSET; /* On flipflop, we saw ... instead of .. */ /* On UNOPs, saw bare parens, e.g. eof(). */ /* On OP_ENTERSUB || OP_NULL, saw a "do". */ + /* On OP_(ENTER|LEAVE)EVAL, don't clear $@ */ + /* On OP_ENTERITER, loop var is per-thread */ + +/* old names; don't use in new code, but don't break them, either */ +#define OPf_LIST OPf_WANT_LIST +#define OPf_KNOW OPf_WANT +#define GIMME \ + (PL_op->op_flags & OPf_WANT \ + ? ((PL_op->op_flags & OPf_WANT) == OPf_WANT_LIST \ + ? G_ARRAY \ + : G_SCALAR) \ + : dowantarray()) /* Private for lvalues */ #define OPpLVAL_INTRO 128 /* Lvalue must be localized */ @@ -73,22 +99,40 @@ typedef U16 PADOFFSET; /* Private for OP_SASSIGN */ #define OPpASSIGN_BACKWARDS 64 /* Left & right switched. */ +/* Private for OP_MATCH and OP_SUBST{,CONST} */ +#define OPpRUNTIME 64 /* Pattern coming in on the stack */ + /* Private for OP_TRANS */ -#define OPpTRANS_SQUASH 16 -#define OPpTRANS_DELETE 32 -#define OPpTRANS_COMPLEMENT 64 +#define OPpTRANS_FROM_UTF 1 +#define OPpTRANS_TO_UTF 2 +#define OPpTRANS_IDENTICAL 4 + /* When CU or UC, means straight latin-1 to utf-8 or vice versa */ + /* Otherwise, IDENTICAL means the right side is the same as the left */ +#define OPpTRANS_SQUASH 8 +#define OPpTRANS_DELETE 16 +#define OPpTRANS_COMPLEMENT 32 +#define OPpTRANS_GROWS 64 /* Private for OP_REPEAT */ #define OPpREPEAT_DOLIST 64 /* List replication. */ /* Private for OP_ENTERSUB, OP_RV2?V, OP_?ELEM */ - /* (lower bits carry hints) */ -#define OPpDEREF_DB 16 /* Debug subroutine. */ -#define OPpDEREF_AV 32 /* Want ref to AV. */ -#define OPpDEREF_HV 64 /* Want ref to HV. */ +#define OPpDEREF (32|64) /* Want ref to something: */ +#define OPpDEREF_AV 32 /* Want ref to AV. */ +#define OPpDEREF_HV 64 /* Want ref to HV. */ +#define OPpDEREF_SV (32|64) /* Want ref to SV. */ + /* OP_ENTERSUB only */ +#define OPpENTERSUB_DB 16 /* Debug subroutine. */ +#define OPpENTERSUB_AMPER 8 /* Used & form to call. */ + /* OP_?ELEM only */ +#define OPpLVAL_DEFER 16 /* Defer creation of array/hash elem */ + /* for OP_RV2?V, lower bits carry hints */ /* Private for OP_CONST */ +#define OPpCONST_ENTERED 16 /* Has been entered as symbol. */ +#define OPpCONST_ARYBASE 32 /* Was a $[ translated to constant. */ #define OPpCONST_BARE 64 /* Was a bare word (filehandle?). */ +#define OPpCONST_WARNING 128 /* Was a $^W translated to constant. */ /* Private for OP_FLIP/FLOP */ #define OPpFLIP_LINENUM 64 /* Range arg potentially a line num. */ @@ -96,8 +140,18 @@ typedef U16 PADOFFSET; /* Private for OP_LIST */ #define OPpLIST_GUESSED 64 /* Guessed that pushmark was needed. */ -/* Private for OP_LEAVE and friends */ -#define OPpLEAVE_VOID 64 /* No need to copy out values. */ +/* Private for OP_DELETE */ +#define OPpSLICE 64 /* Operating on a list of keys */ + +/* Private for OP_SORT, OP_PRTF, OP_SPRINTF, string cmp'n, and case changers */ +#define OPpLOCALE 64 /* Use locale */ + +/* Private for OP_SORT */ +#define OPpSORT_NUMERIC 1 /* Optimized away { $a <=> $b } */ +#define OPpSORT_INTEGER 2 /* Ditto while under "use integer" */ +#define OPpSORT_REVERSE 4 /* Descending sort */ +/* Private for OP_THREADSV */ +#define OPpDONE_SVREF 64 /* Been through newSVREF once */ struct op { BASEOP @@ -143,28 +197,34 @@ struct pmop { OP * op_pmreplstart; PMOP * op_pmnext; /* list of all scanpats */ REGEXP * op_pmregexp; /* compiled expression */ - SV * op_pmshort; /* for a fast bypass of execute() */ U16 op_pmflags; - char op_pmslen; + U16 op_pmpermflags; + U8 op_pmdynflags; }; -#define PMf_USED 0x0001 /* pm has been used once already */ +#define PMdf_USED 0x01 /* pm has been used once already */ +#define PMdf_TAINTED 0x02 /* pm compiled from tainted pattern */ + +#define PMf_RETAINT 0x0001 /* taint $1 etc. if target tainted */ #define PMf_ONCE 0x0002 /* use pattern only once per reset */ -#define PMf_SCANFIRST 0x0004 /* initial constant not anchored */ -#define PMf_ALL 0x0008 /* initial constant is whole pat */ +#define PMf_REVERSED 0x0004 /* Should be matched right->left */ +#define PMf_MAYBE_CONST 0x0008 /* replacement contains variables */ #define PMf_SKIPWHITE 0x0010 /* skip leading whitespace for split */ -#define PMf_FOLD 0x0020 /* case insensitivity */ +#define PMf_WHITE 0x0020 /* pattern is \s+ */ #define PMf_CONST 0x0040 /* subst replacement is constant */ #define PMf_KEEP 0x0080 /* keep 1st runtime pattern forever */ #define PMf_GLOBAL 0x0100 /* pattern had a g modifier */ -#define PMf_RUNTIME 0x0200 /* pattern coming in on the stack */ +#define PMf_CONTINUE 0x0200 /* don't reset pos() if //g fails */ #define PMf_EVAL 0x0400 /* evaluating replacement as expr */ -#define PMf_WHITE 0x0800 /* pattern is \s+ */ +#define PMf_LOCALE 0x0800 /* use locale for character types */ #define PMf_MULTILINE 0x1000 /* assume multiple lines */ #define PMf_SINGLELINE 0x2000 /* assume single line */ -#define PMf_UNUSED 0x4000 /* (unused) */ +#define PMf_FOLD 0x4000 /* case insensitivity */ #define PMf_EXTENDED 0x8000 /* chuck embedded whitespace */ +/* mask of bits stored in regexp->reganch */ +#define PMf_COMPILETIME (PMf_MULTILINE|PMf_SINGLELINE|PMf_LOCALE|PMf_FOLD|PMf_EXTENDED) + struct svop { BASEOP SV * op_sv; @@ -180,12 +240,6 @@ struct pvop { char * op_pv; }; -struct cvop { - BASEOP - CV * op_cv; - OP * op_cont; -}; - struct loop { BASEOP OP * op_first; @@ -196,18 +250,30 @@ struct loop { OP * op_lastop; }; -#define cUNOP ((UNOP*)op) -#define cBINOP ((BINOP*)op) -#define cLISTOP ((LISTOP*)op) -#define cLOGOP ((LOGOP*)op) -#define cCONDOP ((CONDOP*)op) -#define cPMOP ((PMOP*)op) -#define cSVOP ((SVOP*)op) -#define cGVOP ((GVOP*)op) -#define cPVOP ((PVOP*)op) -#define cCVOP ((CVOP*)op) -#define cCOP ((COP*)op) -#define cLOOP ((LOOP*)op) +#define cUNOP ((UNOP*)PL_op) +#define cBINOP ((BINOP*)PL_op) +#define cLISTOP ((LISTOP*)PL_op) +#define cLOGOP ((LOGOP*)PL_op) +#define cCONDOP ((CONDOP*)PL_op) +#define cPMOP ((PMOP*)PL_op) +#define cSVOP ((SVOP*)PL_op) +#define cGVOP ((GVOP*)PL_op) +#define cPVOP ((PVOP*)PL_op) +#define cCOP ((COP*)PL_op) +#define cLOOP ((LOOP*)PL_op) + +#define cUNOPo ((UNOP*)o) +#define cBINOPo ((BINOP*)o) +#define cLISTOPo ((LISTOP*)o) +#define cLOGOPo ((LOGOP*)o) +#define cCONDOPo ((CONDOP*)o) +#define cPMOPo ((PMOP*)o) +#define cSVOPo ((SVOP*)o) +#define cGVOPo ((GVOP*)o) +#define cPVOPo ((PVOP*)o) +#define cCVOPo ((CVOP*)o) +#define cCOPo ((COP*)o) +#define cLOOPo ((LOOP*)o) #define kUNOP ((UNOP*)kid) #define kBINOP ((BINOP*)kid) @@ -218,13 +284,12 @@ struct loop { #define kSVOP ((SVOP*)kid) #define kGVOP ((GVOP*)kid) #define kPVOP ((PVOP*)kid) -#define kCVOP ((CVOP*)kid) #define kCOP ((COP*)kid) #define kLOOP ((LOOP*)kid) #define Nullop Null(OP*) -/* Lowest byte of opargs */ +/* Lowest byte of PL_opargs */ #define OA_MARK 1 #define OA_FOLDCONST 2 #define OA_RETSCALAR 4 @@ -234,9 +299,28 @@ struct loop { #define OA_DANGEROUS 64 #define OA_DEFGV 128 -#define OASHIFT 8 - -/* Remaining nybbles of opargs */ +/* The next 4 bits encode op class information */ +#define OA_CLASS_MASK (15 << 8) + +#define OA_BASEOP (0 << 8) +#define OA_UNOP (1 << 8) +#define OA_BINOP (2 << 8) +#define OA_LOGOP (3 << 8) +#define OA_CONDOP (4 << 8) +#define OA_LISTOP (5 << 8) +#define OA_PMOP (6 << 8) +#define OA_SVOP (7 << 8) +#define OA_GVOP (8 << 8) +#define OA_PVOP_OR_SVOP (9 << 8) +#define OA_LOOP (10 << 8) +#define OA_COP (11 << 8) +#define OA_BASEOP_OR_UNOP (12 << 8) +#define OA_FILESTATOP (13 << 8) +#define OA_LOOPEXOP (14 << 8) + +#define OASHIFT 12 + +/* Remaining nybbles of PL_opargs */ #define OA_SCALAR 1 #define OA_LIST 2 #define OA_AVREF 3