X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=scope.h;h=42d1617eb9d5e041af1639ee30887c5818945b39;hb=25ff0154ccf606eb5512a8cde622caf50e20fba3;hp=5efb8fca53252a3be25fc351259d0768ee714d36;hpb=72dc9ed5af65c946f73050becea29207a1af86c1;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/scope.h b/scope.h
index 5efb8fc..42d1617 100644
--- a/scope.h
+++ b/scope.h
@@ -1,7 +1,7 @@
 /*    scope.h
  *
  *    Copyright (C) 1993, 1994, 1996, 1997, 1998, 1999,
- *    2000, 2001, 2002, 2004, 2005 by Larry Wall and others
+ *    2000, 2001, 2002, 2004, 2005, 2006, 2007 by Larry Wall and others
  *
  *    You may distribute under the terms of either the GNU General Public
  *    License or the Artistic License, as specified in the README file.
@@ -51,15 +51,16 @@
 #define SAVEt_SAVESWITCHSTACK	40
 #define SAVEt_COP_ARYBASE	41
 #define SAVEt_RE_STATE		42
-#define SAVEt_FREESHAREDPV	43
-#define SAVEt_COP_WARNINGS	44
+#define SAVEt_COMPILE_WARNINGS	43
+#define SAVEt_STACK_CXPOS	44
+#define SAVEt_PARSER		45
 
 #ifndef SCOPE_SAVES_SIGNAL_MASK
 #define SCOPE_SAVES_SIGNAL_MASK 0
 #endif
 
-#define SSCHECK(need) if (PL_savestack_ix + (need) > PL_savestack_max) savestack_grow()
-#define SSGROW(need) if (PL_savestack_ix + (need) > PL_savestack_max) savestack_grow_cnt(need)
+#define SSCHECK(need) if (PL_savestack_ix + (I32)(need) > PL_savestack_max) savestack_grow()
+#define SSGROW(need) if (PL_savestack_ix + (I32)(need) > PL_savestack_max) savestack_grow_cnt(need)
 #define SSPUSHINT(i) (PL_savestack[PL_savestack_ix++].any_i32 = (I32)(i))
 #define SSPUSHLONG(i) (PL_savestack[PL_savestack_ix++].any_long = (long)(i))
 #define SSPUSHBOOL(p) (PL_savestack[PL_savestack_ix++].any_bool = (p))
@@ -159,12 +160,12 @@ Closing bracket on a callback.  See C<ENTER> and L<perlcall>.
 	    SSPUSHPTR(GvHV(PL_hintgv));			\
 	    GvHV(PL_hintgv) = Perl_hv_copy_hints_hv(aTHX_ GvHV(PL_hintgv)); \
 	}						\
-	if (PL_compiling.cop_hints) {			\
+	if (PL_compiling.cop_hints_hash) {		\
 	    HINTS_REFCNT_LOCK;				\
-	    PL_compiling.cop_hints->refcounted_he_refcnt++;	\
+	    PL_compiling.cop_hints_hash->refcounted_he_refcnt++;	\
 	    HINTS_REFCNT_UNLOCK;			\
 	}						\
-	SSPUSHPTR(PL_compiling.cop_hints);		\
+	SSPUSHPTR(PL_compiling.cop_hints_hash);		\
 	SSPUSHINT(PL_hints);				\
 	SSPUSHINT(SAVEt_HINTS);				\
     } STMT_END
@@ -194,24 +195,31 @@ Closing bracket on a callback.  See C<ENTER> and L<perlcall>.
 	SSPUSHINT(SAVEt_COP_ARYBASE);			\
     } STMT_END
 
-#define SAVEFREESHAREDPV(pv)				\
-    STMT_START {					\
-	SSCHECK(2);					\
-	SSPUSHPTR(pv);					\
-	SSPUSHINT(SAVEt_FREESHAREDPV);			\
-    } STMT_END
-
-/* Need to do the cop warnings like this, rather than SAVEFREESHAREDPV,
+/* Need to do the cop warnings like this, rather than a "SAVEFREESHAREDPV",
    because realloc() means that the value can actually change. Possibly
    could have done savefreesharedpvREF, but this way actually seems cleaner,
    as it simplifies the code that does the saves, and reduces the load on the
    save stack.  */
-#define SAVECOPWARNINGS(c) \
+#define SAVECOMPILEWARNINGS() \
     STMT_START {					\
-	SSCHECK(3);					\
-	SSPUSHPTR((c)->cop_warnings);			\
-	SSPUSHPTR(c);					\
-	SSPUSHINT(SAVEt_COP_WARNINGS);			\
+	SSCHECK(2);					\
+	SSPUSHPTR(PL_compiling.cop_warnings);		\
+	SSPUSHINT(SAVEt_COMPILE_WARNINGS);		\
+    } STMT_END
+
+#define SAVESTACK_CXPOS() \
+    STMT_START {                                  \
+        SSCHECK(3);                               \
+        SSPUSHINT(cxstack[cxstack_ix].blk_oldsp); \
+        SSPUSHINT(cxstack_ix);                    \
+        SSPUSHINT(SAVEt_STACK_CXPOS);             \
+    } STMT_END
+
+#define SAVEPARSER(p) \
+    STMT_START {                                  \
+        SSCHECK(2);                               \
+        SSPUSHPTR(p);		                  \
+        SSPUSHINT(SAVEt_PARSER); 	          \
     } STMT_END
 
 #ifdef USE_ITHREADS
@@ -219,11 +227,15 @@ Closing bracket on a callback.  See C<ENTER> and L<perlcall>.
 #  define SAVECOPSTASH_FREE(c)	SAVESHAREDPV(CopSTASHPV(c))
 #  define SAVECOPFILE(c)	SAVEPPTR(CopFILE(c))
 #  define SAVECOPFILE_FREE(c)	SAVESHAREDPV(CopFILE(c))
+#  define SAVECOPLABEL(c)	SAVEPPTR(CopLABEL(c))
+#  define SAVECOPLABEL_FREE(c)	SAVESHAREDPV(CopLABEL(c))
 #else
 #  define SAVECOPSTASH(c)	SAVESPTR(CopSTASH(c))
 #  define SAVECOPSTASH_FREE(c)	SAVECOPSTASH(c)	/* XXX not refcounted */
 #  define SAVECOPFILE(c)	SAVESPTR(CopFILEGV(c))
 #  define SAVECOPFILE_FREE(c)	SAVEGENERICSV(CopFILEGV(c))
+#  define SAVECOPLABEL(c)	SAVEPPTR(CopLABEL(c))
+#  define SAVECOPLABEL_FREE(c)	SAVEPPTR(CopLABEL(c))
 #endif
 
 #define SAVECOPLINE(c)		SAVEI32(CopLINE(c))