Skip to content

Format the Python-tokenize module and fix exit path #27935

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
merged 1 commit into from
Aug 25, 2021
Merged

Format the Python-tokenize module and fix exit path #27935

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
93 changes: 46 additions & 47 deletions Python/Python-tokenize.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,15 @@
static struct PyModuleDef _tokenizemodule;

typedef struct {
PyTypeObject* TokenizerIter;
PyTypeObject *TokenizerIter;
} tokenize_state;

static tokenize_state*
get_tokenize_state(PyObject* module)
{
return (tokenize_state*)PyModule_GetState(module);
static tokenize_state *
get_tokenize_state(PyObject *module) {
return (tokenize_state *)PyModule_GetState(module);
}

#define _tokenize_get_state_by_type(type) \
#define _tokenize_get_state_by_type(type) \
get_tokenize_state(_PyType_GetModuleByDef(type, &_tokenizemodule))

#include "clinic/Python-tokenize.c.h"
Expand All @@ -24,9 +23,9 @@ class _tokenizer.tokenizeriter "tokenizeriterobject *" "_tokenize_get_state_by_t
[clinic start generated code]*/
/*[clinic end generated code: output=da39a3ee5e6b4b0d input=96d98ee2fef7a8bc]*/

typedef struct {
PyObject_HEAD
struct tok_state* tok;
typedef struct
{
PyObject_HEAD struct tok_state *tok;
} tokenizeriterobject;

/*[clinic input]
Expand All @@ -40,27 +39,28 @@ static PyObject *
tokenizeriter_new_impl(PyTypeObject *type, const char *source)
/*[clinic end generated code: output=7fd9f46cf9263cbb input=4384b368407375c6]*/
{
tokenizeriterobject* self = (tokenizeriterobject*)type->tp_alloc(type, 0);
tokenizeriterobject *self = (tokenizeriterobject *)type->tp_alloc(type, 0);
if (self == NULL) {
return NULL;
}
PyObject* filename = PyUnicode_FromString("<string>");
PyObject *filename = PyUnicode_FromString("<string>");
if (filename == NULL) {
return NULL;
}
self->tok = PyTokenizer_FromUTF8(source, 1);
if (self->tok == NULL) {
Py_DECREF(filename);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍🏻

return NULL;
}
self->tok->filename = filename;
return (PyObject*)self;
return (PyObject *)self;
}

static PyObject*
tokenizeriter_next(tokenizeriterobject* it)
static PyObject *
tokenizeriter_next(tokenizeriterobject *it)
{
const char* start;
const char* end;
const char *start;
const char *end;
int type = PyTokenizer_Get(it->tok, &start, &end);
if (type == ERRORTOKEN && PyErr_Occurred()) {
return NULL;
Expand All @@ -69,23 +69,24 @@ tokenizeriter_next(tokenizeriterobject* it)
PyErr_SetString(PyExc_StopIteration, "EOF");
return NULL;
}
PyObject* str = NULL;
PyObject *str = NULL;
if (start == NULL || end == NULL) {
str = PyUnicode_FromString("");
} else {
}
else {
str = PyUnicode_FromStringAndSize(start, end - start);
}
if (str == NULL) {
return NULL;
}

Py_ssize_t size = it->tok->inp - it->tok->buf;
PyObject* line = PyUnicode_DecodeUTF8(it->tok->buf, size, "replace");
PyObject *line = PyUnicode_DecodeUTF8(it->tok->buf, size, "replace");
if (line == NULL) {
Py_DECREF(str);
return NULL;
}
const char* line_start = type == STRING ? it->tok->multi_line_start : it->tok->line_start;
const char *line_start = type == STRING ? it->tok->multi_line_start : it->tok->line_start;
int lineno = type == STRING ? it->tok->first_lineno : it->tok->lineno;
int end_lineno = it->tok->lineno;
int col_offset = -1;
Expand All @@ -101,41 +102,39 @@ tokenizeriter_next(tokenizeriterobject* it)
}

static void
tokenizeriter_dealloc(tokenizeriterobject* it)
tokenizeriter_dealloc(tokenizeriterobject *it)
{
PyTypeObject* tp = Py_TYPE(it);
PyTypeObject *tp = Py_TYPE(it);
PyTokenizer_Free(it->tok);
tp->tp_free(it);
Py_DECREF(tp);
}

static PyType_Slot tokenizeriter_slots[] = {
{Py_tp_new, tokenizeriter_new},
{Py_tp_dealloc, tokenizeriter_dealloc},
{Py_tp_getattro, PyObject_GenericGetAttr},
{Py_tp_iter, PyObject_SelfIter},
{Py_tp_iternext, tokenizeriter_next},
{0, NULL},
{Py_tp_new, tokenizeriter_new},
{Py_tp_dealloc, tokenizeriter_dealloc},
{Py_tp_getattro, PyObject_GenericGetAttr},
{Py_tp_iter, PyObject_SelfIter},
{Py_tp_iternext, tokenizeriter_next},
{0, NULL},
};

static PyType_Spec tokenizeriter_spec = {
.name = "_tokenize.TokenizerIter",
.basicsize = sizeof(tokenizeriterobject),
.flags = (Py_TPFLAGS_DEFAULT | Py_TPFLAGS_IMMUTABLETYPE),
.slots = tokenizeriter_slots,
.name = "_tokenize.TokenizerIter",
.basicsize = sizeof(tokenizeriterobject),
.flags = (Py_TPFLAGS_DEFAULT | Py_TPFLAGS_IMMUTABLETYPE),
.slots = tokenizeriter_slots,
};


static int
tokenizemodule_exec(PyObject* m)
tokenizemodule_exec(PyObject *m)
{
tokenize_state* state = get_tokenize_state(m);
tokenize_state *state = get_tokenize_state(m);
if (state == NULL) {
return -1;
}

state->TokenizerIter = (PyTypeObject *)PyType_FromModuleAndSpec(
m, &tokenizeriter_spec, NULL);
state->TokenizerIter = (PyTypeObject *)PyType_FromModuleAndSpec(m, &tokenizeriter_spec, NULL);
if (state->TokenizerIter == NULL) {
return -1;
}
Expand All @@ -147,11 +146,11 @@ tokenizemodule_exec(PyObject* m)
}

static PyMethodDef tokenize_methods[] = {
{NULL, NULL, 0, NULL} /* Sentinel */
{NULL, NULL, 0, NULL} /* Sentinel */
};

static PyModuleDef_Slot tokenizemodule_slots[] = {
{Py_mod_exec, tokenizemodule_exec},
{Py_mod_exec, tokenizemodule_exec},
{0, NULL}
};

Expand All @@ -178,14 +177,14 @@ tokenizemodule_free(void *m)
}

static struct PyModuleDef _tokenizemodule = {
PyModuleDef_HEAD_INIT,
.m_name = "_tokenize",
.m_size = sizeof(tokenize_state),
.m_slots = tokenizemodule_slots,
.m_methods = tokenize_methods,
.m_traverse = tokenizemodule_traverse,
.m_clear = tokenizemodule_clear,
.m_free = tokenizemodule_free,
PyModuleDef_HEAD_INIT,
.m_name = "_tokenize",
.m_size = sizeof(tokenize_state),
.m_slots = tokenizemodule_slots,
.m_methods = tokenize_methods,
.m_traverse = tokenizemodule_traverse,
.m_clear = tokenizemodule_clear,
.m_free = tokenizemodule_free,
};

PyMODINIT_FUNC
Expand Down