Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

gh-109631: Allow interruption of short repeated regex matches (GH-109867) 

Counting for signal checking now continues in new match from the point where
it ended in the previous match instead of starting from 0.
This commit is contained in:
Serhiy Storchaka 2023-09-26 10:56:33 +03:00 committed by GitHub
parent 7c61a361fc
commit 8ac2085b80
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Misc/NEWS.d/next/Library/2023-09-25-23-00-37.gh-issue-109631.eWSqpO.rst Normal file
View File

@ -0,0 +1,3 @@
:mod:`re` functions such as :func:`re.findall`, :func:`re.split`,
:func:`re.search` and :func:`re.sub` which perform short repeated matches
can now be interrupted by user.

1
Modules/_sre/sre.h
View File

@ -95,6 +95,7 @@ typedef struct {
size_t data_stack_base;
/* current repeat context */
SRE_REPEAT *repeat;
unsigned int sigcount;
} SRE_STATE;
typedef struct {

6
Modules/_sre/sre_lib.h
View File

@ -564,7 +564,7 @@ SRE(match)(SRE_STATE* state, const SRE_CODE* pattern, int toplevel)
Py_ssize_t alloc_pos, ctx_pos = -1;
Py_ssize_t ret = 0;
int jump;
unsigned int sigcount=0;
unsigned int sigcount = state->sigcount;
SRE(match_context)* ctx;
SRE(match_context)* nextctx;
@ -1567,8 +1567,10 @@ exit:
ctx_pos = ctx->last_ctx_pos;
jump = ctx->jump;
DATA_POP_DISCARD(ctx);
if (ctx_pos == -1)
if (ctx_pos == -1) {
state->sigcount = sigcount;
return ret;
}
DATA_LOOKUP_AT(SRE(match_context), ctx, ctx_pos);
switch (jump) {