X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=regexp.h;h=3ff959c1201955114a96a49f87dbbe230767e56d;hb=8861ecc69a87dc6907b3e9c79689edb5df16413e;hp=8366fa25a0e90930f9f944237f1f561e4eea5a44;hpb=a759488c42337f2d751890dc78d770629879b394;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/regexp.h b/regexp.h
index 8366fa2..3ff959c 100644
--- a/regexp.h
+++ b/regexp.h
@@ -1,4 +1,11 @@
 /*    regexp.h
+ *
+ *    Copyright (C) 1993, 1994, 1996, 1997, 1999, 2000, 2001, 2003,
+ *    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.
+ *
  */
 
 /*
@@ -30,6 +37,9 @@ typedef struct regexp {
         struct reg_data *data;	/* Additional data. */
 	char *subbeg;		/* saved or original string 
 				   so \digit works forever. */
+#ifdef PERL_OLD_COPY_ON_WRITE
+        SV *saved_copy;         /* If non-NULL, SV which is COW from original */
+#endif
         U32 *offsets;           /* offset annotations 20001228 MJD */
 	I32 sublen;		/* Length of string pointed by subbeg */
 	I32 refcnt;
@@ -58,7 +68,6 @@ typedef struct regexp {
 #define ROPT_EVAL_SEEN		0x00400
 #define ROPT_CANY_SEEN		0x00800
 #define ROPT_SANY_SEEN		ROPT_CANY_SEEN /* src bckwrd cmpt */
-#define ROPT_SEOL_SEEN		0x01000
 
 /* 0xf800 of reganch is used by PMf_COMPILETIME */
 
@@ -66,6 +75,7 @@ typedef struct regexp {
 #define ROPT_NAUGHTY		0x20000 /* how exponential is this pattern? */
 #define ROPT_COPY_DONE		0x40000	/* subbeg is a copy of the string */
 #define ROPT_TAINTED_SEEN	0x80000
+#define ROPT_MATCH_UTF8		0x10000000 /* subbeg is utf-8 */
 
 #define RE_USE_INTUIT_NOML	0x0100000 /* Best to intuit before matching */
 #define RE_USE_INTUIT_ML	0x0200000
@@ -94,6 +104,30 @@ typedef struct regexp {
 					 ? RX_MATCH_COPIED_on(prog) \
 					 : RX_MATCH_COPIED_off(prog))
 
+#ifdef PERL_OLD_COPY_ON_WRITE
+#define RX_MATCH_COPY_FREE(rx) \
+	STMT_START {if (rx->saved_copy) { \
+	    SV_CHECK_THINKFIRST_COW_DROP(rx->saved_copy); \
+	} \
+	if (RX_MATCH_COPIED(rx)) { \
+	    Safefree(rx->subbeg); \
+	    RX_MATCH_COPIED_off(rx); \
+	}} STMT_END
+#else
+#define RX_MATCH_COPY_FREE(rx) \
+	STMT_START {if (RX_MATCH_COPIED(rx)) { \
+	    Safefree(rx->subbeg); \
+	    RX_MATCH_COPIED_off(rx); \
+	}} STMT_END
+#endif
+
+#define RX_MATCH_UTF8(prog)		((prog)->reganch & ROPT_MATCH_UTF8)
+#define RX_MATCH_UTF8_on(prog)		((prog)->reganch |= ROPT_MATCH_UTF8)
+#define RX_MATCH_UTF8_off(prog)		((prog)->reganch &= ~ROPT_MATCH_UTF8)
+#define RX_MATCH_UTF8_set(prog, t)	((t) \
+			? (RX_MATCH_UTF8_on(prog), (PL_reg_match_utf8 = 1)) \
+			: (RX_MATCH_UTF8_off(prog), (PL_reg_match_utf8 = 0)))
+    
 #define REXEC_COPY_STR	0x01		/* Need to copy the string. */
 #define REXEC_CHECKED	0x02		/* check_substr already checked. */
 #define REXEC_SCREAM	0x04		/* use scream table. */