Skip to content

[WIP] bpo-35859: Solution B #12289

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ghost wants to merge 15 commits into from
Closed

[WIP] bpo-35859: Solution B #12289

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
c556d5a
1. add asserts
wjssz Mar 8, 2019
3c294e4
2. macro MARK_PUSH() bug
wjssz Mar 8, 2019
529485e
3. add a new field in_repeat to match_context
wjssz Mar 8, 2019
ad74049
4. use ctx->in_repeat in SRE_OP_BRANCH
wjssz Mar 11, 2019
01d9b8c
5. JUMP_MIN_UNTIL_2 should MARK_PUSH() if in a repeat
wjssz Mar 8, 2019
0db231e
6. JUMP_REPEAT_ONE_[12] should MARK_PUSH() if in a repeat
wjssz Mar 9, 2019
0e51eb6
7. JUMP_MIN_REPEAT_ONE should MARK_PUSH() if in a repeat
wjssz Mar 9, 2019
2bd2eb4
8. JUMP_ASSERT_NOT should LASTMARK_SAVE()
wjssz Mar 10, 2019
c3f2dfc
9. JUMP_ASSERT_NOT should MARK_PUSH() if in a repeat
wjssz Mar 10, 2019
819f6ce
10. polish match_context struct
wjssz Mar 9, 2019
83adf24
11. limit max group to 1,073,741,823
wjssz Mar 10, 2019
8ed447d
12. raise RuntimeError if the span of capture group is wrong
wjssz Mar 11, 2019
db0d1c3
13. clean error process code
wjssz Mar 11, 2019
a6f5a25
14. add blurb
wjssz Mar 11, 2019
0ce0f60
15. JUMP_MIN_UNTIL_3 uses MARK_PUSH() protect
wjssz Mar 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
7. JUMP_MIN_REPEAT_ONE should MARK_PUSH() if in a repeat
  • Loading branch information
@wjssz
wjssz committed Mar 11, 2019
commit 0e51eb67a6e66f1c7f620aeade1fd395a6d79495
7 changes: 7 additions & 0 deletions Lib/test/test_re.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2136,6 +2136,13 @@ def test_bug_35859(self):
self.assertEqual(m.span(), (0, 4))
self.assertEqual(m.groups(), (None, 'a'))

# JUMP_MIN_REPEAT_ONE should MARK_PUSH() if in a repeat
s = 'abab'
p = r'(?:.*?(?=(a)|(b))b)*'
m = re.match(p, s)
self.assertEqual(m.span(), (0, 4))
self.assertEqual(m.groups(), (None, 'b'))


class PatternReprTests(unittest.TestCase):
def check(self, pattern, expected):
Expand Down
13 changes: 12 additions & 1 deletion Modules/sre_lib.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -972,15 +972,25 @@ SRE(match)(SRE_STATE* state, SRE_CODE* pattern, int toplevel)
} else {
/* general case */
LASTMARK_SAVE();
ctx->in_repeat = (state->repeat != NULL);
if (ctx->in_repeat)
MARK_PUSH(ctx->lastmark);

while ((Py_ssize_t)ctx->pattern[2] == SRE_MAXREPEAT
|| ctx->count <= (Py_ssize_t)ctx->pattern[2]) {
state->ptr = ctx->ptr;
DO_JUMP(JUMP_MIN_REPEAT_ONE,jump_min_repeat_one,
ctx->pattern+ctx->pattern[0]);
if (ret) {
if (ctx->in_repeat)
MARK_POP_DISCARD(ctx->lastmark);
RETURN_ON_ERROR(ret);
RETURN_SUCCESS;
}
if (ctx->in_repeat)
MARK_POP_KEEP(ctx->lastmark);
LASTMARK_RESTORE();

state->ptr = ctx->ptr;
ret = SRE(count)(state, ctx->pattern+3, 1);
RETURN_ON_ERROR(ret);
Expand All @@ -990,8 +1000,9 @@ SRE(match)(SRE_STATE* state, SRE_CODE* pattern, int toplevel)
assert(ret == 1);
ctx->ptr++;
ctx->count++;
LASTMARK_RESTORE();
}
if (ctx->in_repeat)
MARK_POP_DISCARD(ctx->lastmark);
}
RETURN_FAILURE;

Expand Down