X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=op.h;h=961ebcfd0cf505a359a72fe33bf1f9052e1e975d;hb=8b88ae9267370552321fe1d45306b5341068d1e2;hp=c230dd0b9929f8a93ce9b53e0824d2f62371e280;hpb=ed6116ce9b9d13712ea252ee248b0400653db7f9;p=p5sagit%2Fp5-mst-13.2.git diff --git a/op.h b/op.h index c230dd0..961ebcf 100644 --- a/op.h +++ b/op.h @@ -1,11 +1,10 @@ -/* $RCSfile: arg.h,v $$Revision: 4.1 $$Date: 92/08/07 17:18:16 $ +/* op.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: arg.h,v $ */ /* @@ -24,9 +23,9 @@ * which may or may not check number of children). */ -typedef U16 PADOFFSET; +typedef U32 PADOFFSET; -#ifdef DEBUGGING +#ifdef DEBUGGING_OPS #define OPCODE opcode #else #define OPCODE U16 @@ -39,53 +38,93 @@ typedef U16 PADOFFSET; PADOFFSET op_targ; \ OPCODE op_type; \ U16 op_seq; \ - char op_flags; \ - char op_private; + U8 op_flags; \ + U8 op_private; -#define GIMME (op->op_flags & OPf_KNOW ? op->op_flags & OPf_LIST : getgimme(op)) +#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(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.) */ -#define OPf_STACKED 16 /* Some arg is arriving on the stack. */ -#define OPf_LVAL 32 /* Certified reference (lvalue). */ -#define OPf_INTRO 64 /* Lvalue must be localized */ +#define OPf_REF 16 /* Certified reference. */ + /* (Return container, not containee). */ +#define OPf_MOD 32 /* Will modify (lvalue). */ +#define OPf_STACKED 64 /* Some arg is arriving on the stack. */ #define OPf_SPECIAL 128 /* Do something weird for this op: */ /* On local LVAL, don't init local value. */ /* On OP_SORT, subroutine is inlined. */ /* On OP_NOT, inversion was implicit. */ - /* On file tests, we fstat filehandle */ + /* On OP_LEAVE, don't restore curpm. */ /* On truncate, we truncate filehandle */ /* On control verbs, we saw no label */ /* On flipflop, we saw ... instead of .. */ /* On UNOPs, saw bare parens, e.g. eof(). */ - /* On OP_ENTERSUBR || OP_NULL, saw a "do". */ + /* On OP_ENTERSUB || OP_NULL, saw a "do". */ + /* On OP_(ENTER|LEAVE)EVAL, don't clear $@ */ + +/* old names; don't use in new code, but don't break them, either */ +#define OPf_LIST 1 +#define OPf_KNOW 2 +#define GIMME \ + (op->op_flags & OPf_KNOW ? op->op_flags & OPf_LIST : dowantarray()) + +/* Private for lvalues */ +#define OPpLVAL_INTRO 128 /* Lvalue must be localized */ -/* Private for OP_ASSIGN */ -#define OPpASSIGN_COMMON 1 /* Left & right have syms in common. */ +/* Private for OP_AASSIGN */ +#define OPpASSIGN_COMMON 64 /* Left & right have syms in common. */ + +/* Private for OP_SASSIGN */ +#define OPpASSIGN_BACKWARDS 64 /* Left & right switched. */ /* Private for OP_TRANS */ -#define OPpTRANS_SQUASH 1 -#define OPpTRANS_DELETE 2 -#define OPpTRANS_COMPLEMENT 4 +#define OPpTRANS_SQUASH 16 +#define OPpTRANS_DELETE 32 +#define OPpTRANS_COMPLEMENT 64 /* Private for OP_REPEAT */ -#define OPpREPEAT_DOLIST 1 /* List replication. */ +#define OPpREPEAT_DOLIST 64 /* List replication. */ -/* Private for OP_SUBR */ -#define OPpSUBR_DB 1 /* Debug subroutine. */ +/* Private for OP_ENTERSUB, OP_RV2?V, OP_?ELEM */ +#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_BARE 1 /* Was a bare word (filehandle?). */ +#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?). */ /* Private for OP_FLIP/FLOP */ -#define OPpFLIP_LINENUM 1 /* Range arg potentially a line num. */ +#define OPpFLIP_LINENUM 64 /* Range arg potentially a line num. */ /* Private for OP_LIST */ -#define OPpLIST_GUESSED 1 /* Guessed that pushmark was needed. */ +#define OPpLIST_GUESSED 64 /* Guessed that pushmark was needed. */ + +/* 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 */ struct op { BASEOP @@ -132,20 +171,27 @@ struct pmop { PMOP * op_pmnext; /* list of all scanpats */ REGEXP * op_pmregexp; /* compiled expression */ SV * op_pmshort; /* for a fast bypass of execute() */ - short op_pmflags; + U16 op_pmflags; + U16 op_pmpermflags; char op_pmslen; }; -#define PMf_USED 1 /* pm has been used once already */ -#define PMf_ONCE 2 /* use pattern only once per reset */ -#define PMf_SCANFIRST 4 /* initial constant not anchored */ -#define PMf_ALL 8 /* initial constant is whole pat */ -#define PMf_SKIPWHITE 16 /* skip leading whitespace for split */ -#define PMf_FOLD 32 /* case insensitivity */ -#define PMf_CONST 64 /* subst replacement is constant */ -#define PMf_KEEP 128 /* keep 1st runtime pattern forever */ -#define PMf_GLOBAL 256 /* pattern had a g modifier */ -#define PMf_RUNTIME 512 /* pattern coming in on the stack */ -#define PMf_EVAL 1024 /* evaluating replacement as expr */ + +#define PMf_USED 0x0001 /* pm has been used once already */ +#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_SKIPWHITE 0x0010 /* skip leading whitespace for split */ +#define PMf_FOLD 0x0020 /* case insensitivity */ +#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_EVAL 0x0400 /* evaluating replacement as expr */ +#define PMf_WHITE 0x0800 /* pattern is \s+ */ +#define PMf_MULTILINE 0x1000 /* assume multiple lines */ +#define PMf_SINGLELINE 0x2000 /* assume single line */ +#define PMf_LOCALE 0x4000 /* use locale for character types */ +#define PMf_EXTENDED 0x8000 /* chuck embedded whitespace */ struct svop { BASEOP @@ -162,12 +208,6 @@ struct pvop { char * op_pv; }; -struct cvop { - BASEOP - CV * op_cv; - OP * op_cont; -}; - struct loop { BASEOP OP * op_first; @@ -187,7 +227,6 @@ struct loop { #define cSVOP ((SVOP*)op) #define cGVOP ((GVOP*)op) #define cPVOP ((PVOP*)op) -#define cCVOP ((CVOP*)op) #define cCOP ((COP*)op) #define cLOOP ((LOOP*)op) @@ -200,9 +239,30 @@ 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 */ +#define OA_MARK 1 +#define OA_FOLDCONST 2 +#define OA_RETSCALAR 4 +#define OA_TARGET 8 +#define OA_RETINTEGER 16 +#define OA_OTHERINT 32 +#define OA_DANGEROUS 64 +#define OA_DEFGV 128 + +#define OASHIFT 8 + +/* Remaining nybbles of opargs */ +#define OA_SCALAR 1 +#define OA_LIST 2 +#define OA_AVREF 3 +#define OA_HVREF 4 +#define OA_CVREF 5 +#define OA_FILEREF 6 +#define OA_SCALARREF 7 +#define OA_OPTIONAL 8 +