-- use charset bitmaps where appropriate. this gives a 5-10%

   speedup for some tests, including the python tokenizer.

-- added support for an optional charset anchor to the engine
   (currently unused by the code generator).

-- removed workaround for array module bug.

1 files changed, 21 insertions, 17 deletions

diff --git a/Modules/sre_constants.h b/Modules/sre_constants.h
index 2ec00bada4..da25ec4bb3 100644
--- a/Modules/sre_constants.h
+++ b/Modules/sre_constants.h
@@ -20,23 +20,24 @@
 #define SRE_OP_BRANCH 6
 #define SRE_OP_CALL 7
 #define SRE_OP_CATEGORY 8
-#define SRE_OP_GROUP 9
-#define SRE_OP_GROUP_IGNORE 10
-#define SRE_OP_IN 11
-#define SRE_OP_IN_IGNORE 12
-#define SRE_OP_INFO 13
-#define SRE_OP_JUMP 14
-#define SRE_OP_LITERAL 15
-#define SRE_OP_LITERAL_IGNORE 16
-#define SRE_OP_MARK 17
-#define SRE_OP_MAX_REPEAT 18
-#define SRE_OP_MAX_REPEAT_ONE 19
-#define SRE_OP_MIN_REPEAT 20
-#define SRE_OP_NOT_LITERAL 21
-#define SRE_OP_NOT_LITERAL_IGNORE 22
-#define SRE_OP_NEGATE 23
-#define SRE_OP_RANGE 24
-#define SRE_OP_REPEAT 25
+#define SRE_OP_CHARSET 9
+#define SRE_OP_GROUP 10
+#define SRE_OP_GROUP_IGNORE 11
+#define SRE_OP_IN 12
+#define SRE_OP_IN_IGNORE 13
+#define SRE_OP_INFO 14
+#define SRE_OP_JUMP 15
+#define SRE_OP_LITERAL 16
+#define SRE_OP_LITERAL_IGNORE 17
+#define SRE_OP_MARK 18
+#define SRE_OP_MAX_REPEAT 19
+#define SRE_OP_MAX_REPEAT_ONE 20
+#define SRE_OP_MIN_REPEAT 21
+#define SRE_OP_NOT_LITERAL 22
+#define SRE_OP_NOT_LITERAL_IGNORE 23
+#define SRE_OP_NEGATE 24
+#define SRE_OP_RANGE 25
+#define SRE_OP_REPEAT 26
 #define SRE_AT_BEGINNING 0
 #define SRE_AT_BEGINNING_LINE 1
 #define SRE_AT_BOUNDARY 2
@@ -68,3 +69,6 @@
 #define SRE_FLAG_DOTALL 16
 #define SRE_FLAG_UNICODE 32
 #define SRE_FLAG_VERBOSE 64
+#define SRE_INFO_PREFIX 1
+#define SRE_INFO_LITERAL 2
+#define SRE_INFO_CHARSET 4