Skip to content

bpo-1635741: Convert _sre types to heap types and establish module state (PEP 384) #23393

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

Merged
corona10 merged 15 commits into from
Nov 20, 2020
Merged

bpo-1635741: Convert _sre types to heap types and establish module state (PEP 384) #23393

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
78b9d53
Add convenience macro
Nov 3, 2020
ce746b3
Convert _sre pattern type to heap type
Nov 3, 2020
529142d
Convert _sre match type to heap type
Nov 3, 2020
7583104
Convert _sre scanner type to heap type
Nov 3, 2020
575fccf
Establish global module state and add types to it
Nov 3, 2020
f82463c
Convert global state to module state
Nov 3, 2020
63ad0f1
Convert _sre to multi-phase initialisation
Nov 3, 2020
27134f0
Add NEWS
Nov 19, 2020
1c925b9
Address Heimes' review: improve module state naming
Nov 19, 2020
12bf771
Merge GH-23101
Nov 19, 2020
0f10f7d
Update clinic
Nov 19, 2020
bdd1338
Address Heimes' review: Drop using _PyType_GetModuleByDef
Nov 19, 2020
a6bc481
Adjust idlelib tiptest
Nov 19, 2020
2fd3bd1
Revert "Adjust idlelib tiptest"
Nov 19, 2020
d9ca7a6
Merge branch 'master' into bpo-1635741/sre
Nov 20, 2020
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
Establish global module state and add types to it
  • Loading branch information
Erlend E. Aasland committed Nov 19, 2020
commit 575fccf664ee40e12b8eb4500c272cea443a5af7
42 changes: 28 additions & 14 deletions Modules/_sre.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,18 +253,28 @@ static PyObject*pattern_new_match(PatternObject*, SRE_STATE*, Py_ssize_t);
static PyObject *pattern_scanner(PatternObject *, PyObject *, Py_ssize_t, Py_ssize_t);


typedef struct {
PyTypeObject *Pattern_Type;
PyTypeObject *Match_Type;
PyTypeObject *Scanner_Type;
} sre_module_state;
Comment thread
erlend-aasland marked this conversation as resolved.
Outdated

sre_module_state sre_global_state;

static sre_module_state *
get_sre_module_state()
{
return &sre_global_state;
}

/*[clinic input]
module _sre
class _sre.SRE_Pattern "PatternObject *" "Pattern_Type"
class _sre.SRE_Match "MatchObject *" "Match_Type"
class _sre.SRE_Scanner "ScannerObject *" "Scanner_Type"
class _sre.SRE_Pattern "PatternObject *" "get_sre_module_state()->Pattern_Type"
class _sre.SRE_Match "MatchObject *" "get_sre_module_state()->Match_Type"
class _sre.SRE_Scanner "ScannerObject *" "get_sre_module_state()->Scanner_Type"
[clinic start generated code]*/
/*[clinic end generated code: output=da39a3ee5e6b4b0d input=b0230ec19a0deac8]*/

static PyTypeObject *Pattern_Type = NULL;
static PyTypeObject *Match_Type = NULL;
static PyTypeObject *Scanner_Type = NULL;

/*[clinic input]
_sre.getcodesize -> int
[clinic start generated code]*/
Expand Down Expand Up @@ -1346,7 +1356,7 @@ _sre_compile_impl(PyObject *module, PyObject *pattern, int flags,

n = PyList_GET_SIZE(code);
/* coverity[ampersand_in_size] */
self = PyObject_NewVar(PatternObject, Pattern_Type, n);
self = PyObject_NewVar(PatternObject, get_sre_module_state()->Pattern_Type, n);
if (!self)
return NULL;
self->weakreflist = NULL;
Expand Down Expand Up @@ -2338,7 +2348,7 @@ pattern_new_match(PatternObject* pattern, SRE_STATE* state, Py_ssize_t status)

/* create match object (with room for extra group marks) */
/* coverity[ampersand_in_size] */
match = PyObject_NewVar(MatchObject, Match_Type,
match = PyObject_NewVar(MatchObject, get_sre_module_state()->Match_Type,
2*(pattern->groups+1));
if (!match)
return NULL;
Expand Down Expand Up @@ -2482,7 +2492,7 @@ pattern_scanner(PatternObject *self, PyObject *string, Py_ssize_t pos, Py_ssize_
ScannerObject* scanner;

/* create scanner object */
scanner = PyObject_New(ScannerObject, Scanner_Type);
scanner = PyObject_New(ScannerObject, get_sre_module_state()->Scanner_Type);
if (!scanner)
return NULL;
scanner->pattern = NULL;
Expand Down Expand Up @@ -2525,14 +2535,17 @@ pattern_hash(PatternObject *self)
static PyObject*
pattern_richcompare(PyObject *lefto, PyObject *righto, int op)
{
sre_module_state *state = get_sre_module_state();
PatternObject *left, *right;
int cmp;

if (op != Py_EQ && op != Py_NE) {
Py_RETURN_NOTIMPLEMENTED;
}

if (!Py_IS_TYPE(lefto, Pattern_Type) || !Py_IS_TYPE(righto, Pattern_Type)) {
if (!Py_IS_TYPE(lefto, state->Pattern_Type) ||
!Py_IS_TYPE(righto, state->Pattern_Type))
{
Py_RETURN_NOTIMPLEMENTED;
}

Expand Down Expand Up @@ -2743,6 +2756,7 @@ do { \

PyMODINIT_FUNC PyInit__sre(void)
{
sre_module_state *state = get_sre_module_state();
PyObject* m;
PyObject* d;
PyObject* x;
Expand All @@ -2752,9 +2766,9 @@ PyMODINIT_FUNC PyInit__sre(void)
return NULL;

/* Create heap types */
CREATE_TYPE(m, Pattern_Type, &pattern_spec);
CREATE_TYPE(m, Match_Type, &match_spec);
CREATE_TYPE(m, Scanner_Type, &scanner_spec);
CREATE_TYPE(m, state->Pattern_Type, &pattern_spec);
CREATE_TYPE(m, state->Match_Type, &match_spec);
CREATE_TYPE(m, state->Scanner_Type, &scanner_spec);

d = PyModule_GetDict(m);

Expand Down