X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=op.h;h=c9ec2df6f0b5881674077303a75c778f0515b394;hb=f948ffe74d98a1c774305dd651dca94c0aceed38;hp=d34435bfa43eb3bdd7a15ccc08f2d2972071c50c;hpb=7934575e193741c310ddb7f01d6d07c9981c3d29;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/op.h b/op.h
index d34435b..c9ec2df 100644
--- a/op.h
+++ b/op.h
@@ -1,6 +1,6 @@
 /*    op.h
  *
- *    Copyright (c) 1991-1999, Larry Wall
+ *    Copyright (c) 1991-2000, 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.
@@ -52,6 +52,20 @@ typedef U32 PADOFFSET;
 	 ((op)->op_flags & OPf_WANT) == OPf_WANT_LIST   ? G_ARRAY   : \
 	 dfl)
 
+/*
+=for apidoc Amn|U32|GIMME_V
+The XSUB-writer's equivalent to Perl's C<wantarray>.  Returns C<G_VOID>,
+C<G_SCALAR> or C<G_ARRAY> for void, scalar or array context,
+respectively.
+
+=for apidoc Amn|U32|GIMME
+A backward-compatible version of C<GIMME_V> which can only return
+C<G_SCALAR> or C<G_ARRAY>; in a void context, it returns C<G_SCALAR>.
+Deprecated.  Use C<GIMME_V> instead.
+
+=cut
+*/
+
 #define GIMME_V		OP_GIMME(PL_op, block_gimme())
 
 /* Public flags */
@@ -77,6 +91,7 @@ typedef U32 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_EXISTS, treat av as av, not avhv.  */
 				/*  On OP_(ENTER|LEAVE)EVAL, don't clear $@ */
 				/*  On OP_ENTERITER, loop var is per-thread */
                                 /*  On pushre, re is /\s+/ imp. by split " " */
@@ -84,6 +99,7 @@ typedef U32 PADOFFSET;
 /* 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		\
@@ -91,6 +107,9 @@ typedef U32 PADOFFSET;
 	      : G_SCALAR)						\
 	   : dowantarray())
 
+/* NOTE: OP_NEXTSTATE, OP_DBSTATE, and OP_SETSTATE (i.e. COPs) carry lower
+ * bits of PL_hints in op_private */
+
 /* Private for lvalues */
 #define OPpLVAL_INTRO	128	/* Lvalue must be localized or lvalue sub */
 
@@ -99,6 +118,7 @@ typedef U32 PADOFFSET;
 
 /* Private for OP_AASSIGN */
 #define OPpASSIGN_COMMON	64	/* Left & right have syms in common. */
+#define OPpASSIGN_HASH		32	/* Assigning to possible pseudohash. */
 
 /* Private for OP_SASSIGN */
 #define OPpASSIGN_BACKWARDS	64	/* Left & right switched. */
@@ -120,6 +140,9 @@ typedef U32 PADOFFSET;
 /* Private for OP_REPEAT */
 #define OPpREPEAT_DOLIST	64	/* List replication. */
 
+/* Private for OP_LEAVELOOP */
+#define OPpLOOP_CONTINUE	64	/* a continue block is present */
+
 /* Private for OP_RV2?V, OP_?ELEM */
 #define OPpDEREF		(32|64)	/* Want ref to something: */
 #define OPpDEREF_AV		32	/*   Want ref to AV. */
@@ -136,7 +159,9 @@ typedef U32 PADOFFSET;
 #define OPpEARLY_CV		32	/* foo() called before sub foo was parsed */
   /* OP_?ELEM only */
 #define OPpLVAL_DEFER		16	/* Defer creation of array/hash elem */
-  /* for OP_RV2?V, lower bits carry hints */
+  /* OP_RV2?V, OP_GVSV only */
+#define OPpOUR_INTRO		16	/* Defer creation of array/hash elem */
+  /* for OP_RV2?V, lower bits carry hints (currently only HINT_STRICT_REFS) */
 
 /* Private for OPs with TARGLEX */
   /* (lower bits may carry MAXARG) */
@@ -158,7 +183,11 @@ typedef U32 PADOFFSET;
 /* 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 */
+/* Private for OP_EXISTS */
+#define OPpEXISTS_SUB		64	/* Checking for &sub, not {} or [].  */
+
+/* Private for OP_SORT, OP_PRTF, OP_SPRINTF, OP_FTTEXT, OP_FTBINARY, */
+/*             string comparisons, and case changers. */
 #define OPpLOCALE		64	/* Use locale */
 
 /* Private for OP_SORT */
@@ -212,6 +241,7 @@ struct pmop {
 
 #define PMdf_USED	0x01		/* pm has been used once already */
 #define PMdf_TAINTED	0x02		/* pm compiled from tainted pattern */
+#define PMdf_UTF8	0x04		/* pm compiled from utf8 data */
 
 #define PMf_RETAINT	0x0001		/* taint $1 etc. if target tainted */
 #define PMf_ONCE	0x0002		/* use pattern only once per reset */
@@ -258,39 +288,73 @@ struct loop {
     OP *	op_lastop;
 };
 
-#define cUNOP ((UNOP*)PL_op)
-#define cBINOP ((BINOP*)PL_op)
-#define cLISTOP ((LISTOP*)PL_op)
-#define cLOGOP ((LOGOP*)PL_op)
-#define cPMOP ((PMOP*)PL_op)
-#define cSVOP ((SVOP*)PL_op)
-#define cPADOP ((PADOP*)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 cPMOPo ((PMOP*)o)
-#define cSVOPo ((SVOP*)o)
-#define cPADOPo ((PADOP*)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)
-#define kLISTOP ((LISTOP*)kid)
-#define kLOGOP ((LOGOP*)kid)
-#define kPMOP ((PMOP*)kid)
-#define kSVOP ((SVOP*)kid)
-#define kPADOP ((PADOP*)kid)
-#define kPVOP ((PVOP*)kid)
-#define kCOP ((COP*)kid)
-#define kLOOP ((LOOP*)kid)
+#define cUNOPx(o)	((UNOP*)o)
+#define cBINOPx(o)	((BINOP*)o)
+#define cLISTOPx(o)	((LISTOP*)o)
+#define cLOGOPx(o)	((LOGOP*)o)
+#define cPMOPx(o)	((PMOP*)o)
+#define cSVOPx(o)	((SVOP*)o)
+#define cPADOPx(o)	((PADOP*)o)
+#define cPVOPx(o)	((PVOP*)o)
+#define cCOPx(o)	((COP*)o)
+#define cLOOPx(o)	((LOOP*)o)
+
+#define cUNOP		cUNOPx(PL_op)
+#define cBINOP		cBINOPx(PL_op)
+#define cLISTOP		cLISTOPx(PL_op)
+#define cLOGOP		cLOGOPx(PL_op)
+#define cPMOP		cPMOPx(PL_op)
+#define cSVOP		cSVOPx(PL_op)
+#define cPADOP		cPADOPx(PL_op)
+#define cPVOP		cPVOPx(PL_op)
+#define cCOP		cCOPx(PL_op)
+#define cLOOP		cLOOPx(PL_op)
+
+#define cUNOPo		cUNOPx(o)
+#define cBINOPo		cBINOPx(o)
+#define cLISTOPo	cLISTOPx(o)
+#define cLOGOPo		cLOGOPx(o)
+#define cPMOPo		cPMOPx(o)
+#define cSVOPo		cSVOPx(o)
+#define cPADOPo		cPADOPx(o)
+#define cPVOPo		cPVOPx(o)
+#define cCOPo		cCOPx(o)
+#define cLOOPo		cLOOPx(o)
+
+#define kUNOP		cUNOPx(kid)
+#define kBINOP		cBINOPx(kid)
+#define kLISTOP		cLISTOPx(kid)
+#define kLOGOP		cLOGOPx(kid)
+#define kPMOP		cPMOPx(kid)
+#define kSVOP		cSVOPx(kid)
+#define kPADOP		cPADOPx(kid)
+#define kPVOP		cPVOPx(kid)
+#define kCOP		cCOPx(kid)
+#define kLOOP		cLOOPx(kid)
+
+
+#ifdef USE_ITHREADS
+#  define	cGVOPx_gv(o)	((GV*)PL_curpad[cPADOPx(o)->op_padix])
+#  define	IS_PADGV(v)	(v && SvTYPE(v) == SVt_PVGV && GvIN_PAD(v))
+#  define	IS_PADCONST(v)	(v && SvREADONLY(v))
+#  define	cSVOPx_sv(v)	(cSVOPx(v)->op_sv \
+				 ? cSVOPx(v)->op_sv : PL_curpad[(v)->op_targ])
+#  define	cSVOPx_svp(v)	(cSVOPx(v)->op_sv \
+				 ? &cSVOPx(v)->op_sv : &PL_curpad[(v)->op_targ])
+#else
+#  define	cGVOPx_gv(o)	((GV*)cSVOPx(o)->op_sv)
+#  define	IS_PADGV(v)	FALSE
+#  define	IS_PADCONST(v)	FALSE
+#  define	cSVOPx_sv(v)	(cSVOPx(v)->op_sv)
+#  define	cSVOPx_svp(v)	(&cSVOPx(v)->op_sv)
+#endif
+
+#define	cGVOP_gv		cGVOPx_gv(PL_op)
+#define	cGVOPo_gv		cGVOPx_gv(o)
+#define	kGVOP_gv		cGVOPx_gv(kid)
+#define cSVOP_sv		cSVOPx_sv(PL_op)
+#define cSVOPo_sv		cSVOPx_sv(o)
+#define kSVOP_sv		cSVOPx_sv(kid)
 
 #define Nullop Null(OP*)