summaryrefslogtreecommitdiffstats
path: root/Modules/_sre.c
diff options
context:
space:
mode:
authorFredrik Lundh <fredrik@pythonware.com>2001-10-18 19:30:16 (GMT)
committerFredrik Lundh <fredrik@pythonware.com>2001-10-18 19:30:16 (GMT)
commit397a654791e6bc8b108945e45e7d1393cc6f32d4 (patch)
tree0bcf95e153017bddb35c1549d2e7c9e31f676111 /Modules/_sre.c
parent3bb4d214a470c4da4af63f5a2c098cc886b9e857 (diff)
downloadcpython-397a654791e6bc8b108945e45e7d1393cc6f32d4.zip
cpython-397a654791e6bc8b108945e45e7d1393cc6f32d4.tar.gz
cpython-397a654791e6bc8b108945e45e7d1393cc6f32d4.tar.bz2
SRE bug #441409:
compile should raise error for non-strings SRE bug #432570, 448951: reset group after failed match also bumped version number to 2.2.0
Diffstat (limited to 'Modules/_sre.c')
-rw-r--r--Modules/_sre.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/Modules/_sre.c b/Modules/_sre.c
index 32cd48b..537dc29 100644
--- a/Modules/_sre.c
+++ b/Modules/_sre.c
@@ -32,6 +32,7 @@
* 2001-05-14 fl fixes for 1.5.2
* 2001-07-01 fl added BIGCHARSET support (from Martin von Loewis)
* 2001-09-18 fl added _getliteral helper
+ * 2001-10-18 fl fixed group reset issue (from Matthew Mueller)
*
* Copyright (c) 1997-2001 by Secret Labs AB. All rights reserved.
*
@@ -47,7 +48,7 @@
#ifndef SRE_RECURSIVE
static char copyright[] =
- " SRE 2.1.1 Copyright (c) 1997-2001 by Secret Labs AB ";
+ " SRE 2.2.0 Copyright (c) 1997-2001 by Secret Labs AB ";
#include "Python.h"
#include "structmember.h" /* offsetof */
@@ -1061,6 +1062,7 @@ SRE_MATCH(SRE_STATE* state, SRE_CODE* pattern, int level)
if (i)
return i;
i = mark_restore(state, 0, lastmark);
+ state->lastmark = lastmark;
if (i < 0)
return i;
rp->count = count - 1;