Filter::Simple: eliminate /\C/

[perl5.git] / cop.h

diff --git a/cop.h b/cop.h
index d74da17..37980f0 100644 (file)
--- a/cop.h
+++ b/cop.h
@@ -370,41 +370,27 @@ string/length pair.
 
 #include "mydtrace.h"
 
+struct cop {
+    BASEOP
+    /* On LP64 putting this here takes advantage of the fact that BASEOP isn't
+       an exact multiple of 8 bytes to save structure padding.  */
+    line_t      cop_line;       /* line # of this command */
+    /* label for this construct is now stored in cop_hints_hash */
 #ifdef USE_ITHREADS
-# define _COP_STASH_N_FILE \
-    PADOFFSET  cop_stashoff;   /* offset into PL_stashpad, for the     \
-                                  package the line was compiled in */  \
+    PADOFFSET  cop_stashoff;   /* offset into PL_stashpad, for the
+                                  package the line was compiled in */
     char *     cop_file;       /* file name the following line # is from */
 #else
-# define _COP_STASH_N_FILE \
-    HV *       cop_stash;      /* package line was compiled in */      \
+    HV *       cop_stash;      /* package line was compiled in */
     GV *       cop_filegv;     /* file the following line # is from */
 #endif
-
-#define _COP_FIELDS \
-    /* On LP64 putting this here takes advantage of the fact that BASEOP \
-       isn't an exact multiple of 8 bytes to save structure padding.  */ \
-    line_t      cop_line;       /* line # of this command */            \
-    /* label for this construct is now stored in cop_hints_hash */      \
-    _COP_STASH_N_FILE                                                   \
-    U32                cop_hints;      /* hints bits from pragmata */           \
-    U32                cop_seq;        /* parse sequence number */              \
-    /* Beware. mg.c and warnings.pl assume the type of this             \
-       is STRLEN *:  */                                                         \
-    STRLEN *   cop_warnings;   /* lexical warnings bitmask */           \
-    /* compile time state of %^H.  See the comment in op.c for how this         \
-       is used to recreate a hash to return from caller.  */            \
+    U32                cop_hints;      /* hints bits from pragmata */
+    U32                cop_seq;        /* parse sequence number */
+    /* Beware. mg.c and warnings.pl assume the type of this is STRLEN *:  */
+    STRLEN *   cop_warnings;   /* lexical warnings bitmask */
+    /* compile time state of %^H.  See the comment in op.c for how this is
+       used to recreate a hash to return from caller.  */
     COPHH *    cop_hints_hash;
-
-struct cop {
-    BASEOP
-    _COP_FIELDS
-};
-
-struct dbop {
-    BASEOP
-    _COP_FIELDS
-    size_t     dbop_seq;       /* sequence number for breakpoint */
 };
 
 #ifdef USE_ITHREADS
@@ -414,7 +400,7 @@ struct dbop {
                                 
 #  ifdef NETWARE
 #    define CopFILE_set(c,pv)  ((c)->cop_file = savepv(pv))
-#    define CopFILE_setn(c,pv,l)  ((c)->cop_file = savepv((pv),(l)))
+#    define CopFILE_setn(c,pv,l)  ((c)->cop_file = savepvn((pv),(l)))
 #  else
 #    define CopFILE_set(c,pv)  ((c)->cop_file = savesharedpv(pv))
 #    define CopFILE_setn(c,pv,l)  ((c)->cop_file = savesharedpvn((pv),(l)))
@@ -1177,14 +1163,14 @@ typedef struct stackinfo PERL_SI;
 =head1 Multicall Functions
 
 =for apidoc Ams||dMULTICALL
-Declare local variables for a multicall. See L<perlcall/LIGHTWEIGHT CALLBACKS>.
+Declare local variables for a multicall.  See L<perlcall/LIGHTWEIGHT CALLBACKS>.
 
 =for apidoc Ams||PUSH_MULTICALL
 Opening bracket for a lightweight callback.
 See L<perlcall/LIGHTWEIGHT CALLBACKS>.
 
 =for apidoc Ams||MULTICALL
-Make a lightweight callback. See L<perlcall/LIGHTWEIGHT CALLBACKS>.
+Make a lightweight callback.  See L<perlcall/LIGHTWEIGHT CALLBACKS>.
 
 =for apidoc Ams||POP_MULTICALL
 Closing bracket for a lightweight callback.