X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=regexp.h;h=5082610f57cfb60d3c8a2f5d6f533d7f431b0537;hb=a1e2a3203e4b30744c9b7c687f0438326033e3c3;hp=2f7aa02b3d393a019b8274f0cbdb94c3de6fdec4;hpb=c277df42229d99fecbc76f5da53793a409ac66e1;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/regexp.h b/regexp.h
index 2f7aa02..5082610 100644
--- a/regexp.h
+++ b/regexp.h
@@ -17,6 +17,22 @@ struct regnode {
 
 typedef struct regnode regnode;
 
+struct reg_data {
+    U32 count;
+    U8 *what;
+    void* data[1];
+};
+
+struct reg_substr_datum {
+    I32 min_offset;
+    I32 max_offset;
+    SV *substr;
+};
+
+struct reg_substr_data {
+    struct reg_substr_datum data[3];	/* Actual array */
+};
+
 typedef struct regexp {
 	I32 refcnt;
 	char **startp;
@@ -30,9 +46,9 @@ typedef struct regexp {
 	char *subbase;		/* saved string so \digit works forever */
 	char *subbeg;		/* same, but not responsible for allocation */
 	char *subend;		/* end of subbase */
-	U16 naughty;		/* how exponential is this pattern? */
-	U16 reganch;		/* Internal use only +
+	U32 reganch;		/* Internal use only +
 				   Tainted information used by regexec? */
+#if 0
         SV *anchored_substr;	/* Substring at fixed position wrt start. */
 	I32 anchored_offset;	/* Position of it. */
         SV *float_substr;	/* Substring at variable position wrt start. */
@@ -41,28 +57,47 @@ typedef struct regexp {
         SV *check_substr;	/* Substring to check before matching. */
         I32 check_offset_min;	/* Offset of the above. */
         I32 check_offset_max;	/* Offset of the above. */
+#else
+        struct reg_substr_data *substrs;
+#endif
         struct reg_data *data;	/* Additional data. */
 	regnode program[1];	/* Unwarranted chumminess with compiler. */
 } regexp;
 
+#define anchored_substr substrs->data[0].substr
+#define anchored_offset substrs->data[0].min_offset
+#define float_substr substrs->data[1].substr
+#define float_min_offset substrs->data[1].min_offset
+#define float_max_offset substrs->data[1].max_offset
+#define check_substr substrs->data[2].substr
+#define check_offset_min substrs->data[2].min_offset
+#define check_offset_max substrs->data[2].max_offset
+
 #define ROPT_ANCH		(ROPT_ANCH_BOL|ROPT_ANCH_MBOL|ROPT_ANCH_GPOS)
 #define ROPT_ANCH_SINGLE	(ROPT_ANCH_BOL|ROPT_ANCH_GPOS)
-#define ROPT_ANCH_BOL	 	1
-#define ROPT_ANCH_MBOL	 	2
-#define ROPT_ANCH_GPOS	 	4
-#define ROPT_SKIP		8
-#define ROPT_IMPLICIT		0x10	/* Converted .* to ^.* */
-#define ROPT_NOSCAN		0x20	/* Check-string always at start. */
-#define ROPT_GPOS_SEEN		0x40
-#define ROPT_CHECK_ALL		0x80
-#define ROPT_LOOKBEHIND_SEEN	0x100
+#define ROPT_ANCH_BOL	 	0x00001
+#define ROPT_ANCH_MBOL	 	0x00002
+#define ROPT_ANCH_GPOS	 	0x00004
+#define ROPT_SKIP		0x00008
+#define ROPT_IMPLICIT		0x00010	/* Converted .* to ^.* */
+#define ROPT_NOSCAN		0x00020	/* Check-string always at start. */
+#define ROPT_GPOS_SEEN		0x00040
+#define ROPT_CHECK_ALL		0x00080
+#define ROPT_LOOKBEHIND_SEEN	0x00100
+#define ROPT_EVAL_SEEN		0x00200
+#define ROPT_TAINTED_SEEN	0x00400
+
+/* 0xf800 of reganch is used by PMf_COMPILETIME */
 
-#define ROPT_TAINTED_SEEN	0x8000
+#define ROPT_UTF8		0x10000
+#define ROPT_NAUGHTY		0x20000 /* how exponential is this pattern? */
 
 #define RX_MATCH_TAINTED(prog)	((prog)->reganch & ROPT_TAINTED_SEEN)
-#define RX_MATCH_TAINTED_SET(prog, t) ((t) \
-				       ? ((prog)->reganch |= ROPT_TAINTED_SEEN) \
-				       : ((prog)->reganch &= ~ROPT_TAINTED_SEEN))
+#define RX_MATCH_TAINTED_on(prog) ((prog)->reganch |= ROPT_TAINTED_SEEN)
+#define RX_MATCH_TAINTED_off(prog) ((prog)->reganch &= ~ROPT_TAINTED_SEEN)
+#define RX_MATCH_TAINTED_set(prog, t) ((t) \
+				       ? RX_MATCH_TAINTED_on(prog) \
+				       : RX_MATCH_TAINTED_off(prog))
 
 #define REXEC_COPY_STR	1		/* Need to copy the string. */
 #define REXEC_CHECKED	2		/* check_substr already checked. */