adjust testsuite for change#3067

[perl5.git] / op.h

diff --git a/op.h b/op.h
index 9ec72e9..8a9f81d 100644 (file)
--- a/op.h
+++ b/op.h
@@ -103,13 +103,15 @@ typedef U32 PADOFFSET;
 #define OPpRUNTIME             64      /* Pattern coming in on the stack */
 
 /* Private for OP_TRANS */
-#define OPpTRANS_GROWS         1
-#define OPpTRANS_FROM_UTF      2
-#define OPpTRANS_TO_UTF                4
-#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. */
@@ -130,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. */
@@ -143,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 */
 
@@ -282,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
@@ -313,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