diff options
author | Gustavo Niemeyer <gustavo@niemeyer.net> | 2002-11-06 14:06:53 (GMT) |
---|---|---|
committer | Gustavo Niemeyer <gustavo@niemeyer.net> | 2002-11-06 14:06:53 (GMT) |
commit | 4e7be06a652680611a81d6bb1fb03ce4227ac02e (patch) | |
tree | 0abf84675d23c70b00736be2692b59a6fd5c0222 /Lib/test/test_sre.py | |
parent | 3c2c43341792b886740adec80ff875b1461a0ef2 (diff) | |
download | cpython-4e7be06a652680611a81d6bb1fb03ce4227ac02e.zip cpython-4e7be06a652680611a81d6bb1fb03ce4227ac02e.tar.gz cpython-4e7be06a652680611a81d6bb1fb03ce4227ac02e.tar.bz2 |
Fixed bug #470582, using a modified version of patch #527371,
from Greg Chapman.
* Modules/_sre.c
(lastmark_restore): New function, implementing algorithm to restore
a state to a given lastmark. In addition to the similar algorithm used
in a few places of SRE_MATCH, restore lastindex when restoring lastmark.
(SRE_MATCH): Replace lastmark inline restoring by lastmark_restore(),
function. Also include it where missing. In SRE_OP_MARK, set lastindex
only if i > lastmark.
* Lib/test/re_tests.py
* Lib/test/test_sre.py
Included regression tests for the fixed bugs.
* Misc/NEWS
Mention fixes.
Diffstat (limited to 'Lib/test/test_sre.py')
-rw-r--r-- | Lib/test/test_sre.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Lib/test/test_sre.py b/Lib/test/test_sre.py index 284212c..6a00aff 100644 --- a/Lib/test/test_sre.py +++ b/Lib/test/test_sre.py @@ -78,6 +78,11 @@ test(r"""sre.match(r'(a)|(b)', 'b').start(1)""", -1) test(r"""sre.match(r'(a)|(b)', 'b').end(1)""", -1) test(r"""sre.match(r'(a)|(b)', 'b').span(1)""", (-1, -1)) +# bug described in patch 527371 +test(r"""sre.match(r'(a)?a','a').lastindex""", None) +test(r"""sre.match(r'(a)(b)?b','ab').lastindex""", 1) +test(r"""sre.match(r'(?P<a>a)(?P<b>b)?b','ab').lastgroup""", 'a') + if verbose: print 'Running tests on sre.sub' |