adjust testsuite for change#3067

[perl5.git] / op.h

diff --git a/op.h b/op.h
index d5f7c90..8a9f81d 100644 (file)
--- a/op.h
+++ b/op.h
@@ -52,7 +52,7 @@ typedef U32 PADOFFSET;
         ((op)->op_flags & OPf_WANT) == OPf_WANT_LIST   ? G_ARRAY   : \
         dfl)
 
-#define GIMME_V                OP_GIMME(op, block_gimme())
+#define GIMME_V                OP_GIMME(PL_op, block_gimme())
 
 /* Public flags */
 
@@ -84,8 +84,8 @@ typedef U32 PADOFFSET;
 #define OPf_LIST       OPf_WANT_LIST
 #define OPf_KNOW       OPf_WANT
 #define GIMME \
-         (op->op_flags & OPf_WANT                                      \
-          ? ((op->op_flags & OPf_WANT) == OPf_WANT_LIST                \
+         (PL_op->op_flags & OPf_WANT                                   \
+          ? ((PL_op->op_flags & OPf_WANT) == OPf_WANT_LIST             \
              ? G_ARRAY                                                 \
              : G_SCALAR)                                               \
           : dowantarray())
@@ -103,10 +103,15 @@ typedef U32 PADOFFSET;
 #define OPpRUNTIME             64      /* Pattern coming in on the stack */
 
 /* Private for OP_TRANS */
-#define OPpTRANS_COUNTONLY     8
-#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. */
@@ -127,6 +132,7 @@ typedef U32 PADOFFSET;
 #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. */
@@ -140,6 +146,10 @@ typedef U32 PADOFFSET;
 /* 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 */
 
@@ -240,17 +250,17 @@ 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 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)
@@ -279,7 +289,7 @@ struct loop {
 
 #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
@@ -310,7 +320,7 @@ struct loop {
 
 #define OASHIFT 12
 
-/* Remaining nybbles of opargs */
+/* Remaining nybbles of PL_opargs */
 #define OA_SCALAR 1
 #define OA_LIST 2
 #define OA_AVREF 3