reapplied darryl gallion's minimizing repeat fix. I'm still not 100%

Fredrik Lundh · Fredrik Lundh · commit df781e6a3f05 · 2001-07-02T19:54:28.000Z
sure about this one, but test #133283 now works even with the fix in place, and so does the test suite. we'll see what comes up...
diff --git a/Lib/test/re_tests.py b/Lib/test/re_tests.py
@@ -638,6 +638,8 @@
     (r'(?i)[m]+', 'MMM', SUCCEED, 'found', 'MMM'),
     # bug 130748: ^* should be an error (nothing to repeat)
     (r'^*', '', SYNTAX_ERROR),
+    # bug 133283: minimizing repeat bug
+    (r'"(?:\\"|[^"])*?"', r'"\""', SUCCEED, 'found', r'"\"'),
 ]
 
 try:
diff --git a/Lib/test/test_sre.py b/Lib/test/test_sre.py
@@ -245,7 +245,7 @@ def bump_num(matchobj):
 # implementation of repeated groups.
 test("sre.match('(x)*', 50000*'x').span()", (0, 50000), RuntimeError)
 test("sre.match(r'(x)*y', 50000*'x'+'y').span()", (0, 50001), RuntimeError)
-test("sre.match(r'(x)*?y', 50000*'x'+'y').span()", (0, 50001), RuntimeError)
+test("sre.match(r'(x)*?y', 50000*'x'+'y').span()", (0, 50001))
 
 from re_tests import *
 
diff --git a/Modules/_sre.c b/Modules/_sre.c
@@ -1104,7 +1104,7 @@ SRE_MATCH(SRE_STATE* state, SRE_CODE* pattern, int level)
             /* see if the tail matches */
             state->repeat = rp->prev;
             /* FIXME: the following fix doesn't always work (#133283) */
-            if (0 && rp->pattern[2] == 65535) {
+            if (rp->pattern[2] == 65535) {
                 /* unbounded repeat */
                 for (;;) {
                     i = SRE_MATCH(state, pattern, level + 1);

Original file line number	Diff line number	Diff line change
`@@ -638,6 +638,8 @@`
`638`	`638`	`(r'(?i)[m]+', 'MMM', SUCCEED, 'found', 'MMM'),`
`639`	`639`	`# bug 130748: ^* should be an error (nothing to repeat)`
`640`	`640`	`(r'^*', '', SYNTAX_ERROR),`
	`641`	`+ # bug 133283: minimizing repeat bug`
	`642`	`+ (r'"(?:\\"\|[^"])*?"', r'"\""', SUCCEED, 'found', r'"\"'),`
`641`	`643`	`]`
`642`	`644`
`643`	`645`	`try:`