X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=regcomp.h;h=ee9be39f714bdb2ce8bef3057e0124ce79a9b7b7;hb=918426be7f3660c63cebe082bf8eac82a38bf756;hp=e30e67f30f4be15b707e3edbfc6db73bfb0fe047;hpb=aaa51d5e11b8b0db616a7f939c784733b4cfef87;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/regcomp.h b/regcomp.h
index e30e67f..ee9be39 100644
--- a/regcomp.h
+++ b/regcomp.h
@@ -88,12 +88,13 @@ struct regnode_2 {
 };
 
 #define ANYOF_BITMAP_SIZE	32	/* 256 b/(8 b/B) */
-#define ANYOF_CLASSBITMAP_SIZE	 4
+#define ANYOF_CLASSBITMAP_SIZE	 4	/* up to 32 (8*4) named classes */
 
 struct regnode_charclass {
     U8	flags;
     U8  type;
     U16 next_off;
+    U32 arg1;
     char bitmap[ANYOF_BITMAP_SIZE];
 };
 
@@ -101,6 +102,7 @@ struct regnode_charclass_class {
     U8	flags;
     U8  type;
     U16 next_off;
+    U32 arg1;
     char bitmap[ANYOF_BITMAP_SIZE];
     char classflags[ANYOF_CLASSBITMAP_SIZE];
 };
@@ -176,29 +178,38 @@ struct regnode_charclass_class {
 
 #define REG_MAGIC 0234
 
-#define SIZE_ONLY (PL_regcode == &PL_regdummy)
+#define SIZE_ONLY (RExC_emit == &PL_regdummy)
 
 /* Flags for node->flags of ANYOF */
 
-#define ANYOF_CLASS	0x08
-#define ANYOF_INVERT	0x04
-#define ANYOF_FOLD	0x02
-#define ANYOF_LOCALE	0x01
+#define ANYOF_CLASS		0x08
+#define ANYOF_INVERT		0x04
+#define ANYOF_FOLD		0x02
+#define ANYOF_LOCALE		0x01
 
 /* Used for regstclass only */
-#define ANYOF_EOS	0x10		/* Can match an empty string too */
+#define ANYOF_EOS		0x10		/* Can match an empty string too */
+
+/* There is a character or a range past 0xff */
+#define ANYOF_UNICODE		0x20
+#define ANYOF_UNICODE_ALL	0x40	/* Can match any char past 0xff */
+
+/* Are there any runtime flags on in this node? */
+#define ANYOF_RUNTIME(s)	(ANYOF_FLAGS(s) & 0x0f)
+
+#define ANYOF_FLAGS_ALL		0xff
 
 /* Character classes for node->classflags of ANYOF */
 /* Should be synchronized with a table in regprop() */
 /* 2n should pair with 2n+1 */
 
-#define ANYOF_ALNUM	 0	/* \w, utf8::IsWord, isALNUM() */
+#define ANYOF_ALNUM	 0	/* \w, PL_utf8_alnum, utf8::IsWord, ALNUM */
 #define ANYOF_NALNUM	 1
 #define ANYOF_SPACE	 2	/* \s */
 #define ANYOF_NSPACE	 3
 #define ANYOF_DIGIT	 4
 #define ANYOF_NDIGIT	 5
-#define ANYOF_ALNUMC	 6	/* isalnum(3), utf8::IsAlnum, isALNUMC() */
+#define ANYOF_ALNUMC	 6	/* isalnum(3), utf8::IsAlnum, ALNUMC */
 #define ANYOF_NALNUMC	 7
 #define ANYOF_ALPHA	 8
 #define ANYOF_NALPHA	 9
@@ -220,8 +231,8 @@ struct regnode_charclass_class {
 #define ANYOF_NXDIGIT	25
 #define ANYOF_PSXSPC	26	/* POSIX space: \s plus the vertical tab */
 #define ANYOF_NPSXSPC	27
-#define ANYOF_BLANK	28
-#define ANYOF_NBLANK	29	/* GNU extension: space and tab */
+#define ANYOF_BLANK	28	/* GNU extension: space and tab: non-vertical space */
+#define ANYOF_NBLANK	29
 
 #define ANYOF_MAX	32
 
@@ -238,7 +249,6 @@ struct regnode_charclass_class {
 #define ANYOF_CLASS_SIZE	(sizeof(struct regnode_charclass_class))
 
 #define ANYOF_FLAGS(p)		((p)->flags)
-#define ANYOF_FLAGS_ALL		0xff
 
 #define ANYOF_BIT(c)		(1 << ((c) & 7))
 
@@ -275,10 +285,11 @@ struct regnode_charclass_class {
 
 #define EXTRA_SIZE(guy) ((sizeof(guy)-1)/sizeof(struct regnode))
 
-#define REG_SEEN_ZERO_LEN	1
-#define REG_SEEN_LOOKBEHIND	2
-#define REG_SEEN_GPOS		4
-#define REG_SEEN_EVAL		8
+#define REG_SEEN_ZERO_LEN	 1
+#define REG_SEEN_LOOKBEHIND	 2
+#define REG_SEEN_GPOS		 4
+#define REG_SEEN_EVAL		 8
+#define REG_SEEN_SANY		16
 
 START_EXTERN_C
 
@@ -300,12 +311,14 @@ EXTCONST U8 PL_varies[] = {
 EXTCONST U8 PL_simple[];
 #else
 EXTCONST U8 PL_simple[] = {
-    REG_ANY, ANYUTF8, SANY, SANYUTF8, ANYOF, ANYOFUTF8,
-    ALNUM, ALNUMUTF8, ALNUML, ALNUMLUTF8,
-    NALNUM, NALNUMUTF8, NALNUML, NALNUMLUTF8,
-    SPACE, SPACEUTF8, SPACEL, SPACELUTF8,
-    NSPACE, NSPACEUTF8, NSPACEL, NSPACELUTF8,
-    DIGIT, DIGITUTF8, NDIGIT, NDIGITUTF8, 0
+    REG_ANY,	SANY,
+    ANYOF,
+    ALNUM,	ALNUML,
+    NALNUM,	NALNUML,
+    SPACE,	SPACEL,
+    NSPACE,	NSPACEL,
+    DIGIT,	NDIGIT,
+    0
 };
 #endif