X-Git-Url: https://perl5.git.perl.org/perl5.git/blobdiff_plain/0053d415f506c0bd87de287f5b4d68652d94b7b1..1d40d392b48cbc36778fbf815dc5349f0b471377:/op.h?ds=sidebyside

diff --git a/op.h b/op.h
index b230988..e263a9c 100644
--- a/op.h
+++ b/op.h
@@ -45,7 +45,7 @@
 #  define MADPROP_IN_BASEOP
 #endif
 
-typedef PERL_BITFIELD16 optype;
+typedef PERL_BITFIELD16 Optype;
 
 #ifdef BASEOP_DEFINITION
 #define BASEOP BASEOP_DEFINITION
@@ -112,8 +112,6 @@ Deprecated.  Use C<GIMME_V> instead.
 #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_CONST, value is the hints hash for
-				    eval, so return a copy from pp_const() */
 				/*  On OP_SORT, subroutine is inlined. */
 				/*  On OP_NOT, inversion was implicit. */
 				/*  On OP_LEAVE, don't restore curpm. */
@@ -268,13 +266,6 @@ Deprecated.  Use C<GIMME_V> instead.
 /* Private for OP_FTXXX */
 #define OPpFT_ACCESS		2	/* use filetest 'access' */
 #define OPpFT_STACKED		4	/* stacked filetest, as in "-f -x $f" */
-#define OP_IS_FILETEST_ACCESS(op) 		\
-	(((op)->op_type) == OP_FTRREAD  ||	\
-	 ((op)->op_type) == OP_FTRWRITE ||	\
-	 ((op)->op_type) == OP_FTREXEC  ||	\
-	 ((op)->op_type) == OP_FTEREAD  ||	\
-	 ((op)->op_type) == OP_FTEWRITE ||	\
-	 ((op)->op_type) == OP_FTEEXEC)
 
 /* Private for OP_(MAP|GREP)(WHILE|START) */
 #define OPpGREP_LEX		2	/* iterate over lexical $_ */
@@ -349,9 +340,9 @@ struct pmop {
 /* BEWARE - something that calls this macro passes (r) which has a side
    effect.  */
 #define PM_SETRE(o,r)	STMT_START {					\
-                            const REGEXP *const whap = (r);		\
-                            assert(whap);				\
-			    PL_regex_pad[(o)->op_pmoffset] = (SV*)whap;	\
+                            const REGEXP *const _pm_setre = (r);	\
+                            assert(_pm_setre);				\
+			    PL_regex_pad[(o)->op_pmoffset] = (SV*)_pm_setre; \
                         } STMT_END
 #else
 #define PM_GETRE(o)     ((o)->op_pmregexp)