Skip to content
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.

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

GH-81057: remove static state from suggestions.c #99411

Merged
merged 4 commits into from
Nov 30, 2022
Merged
Changes from all commits
Commits
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
27 changes: 19 additions & 8 deletions Python/suggestions.c
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,8 @@ substitution_cost(char a, char b)
static Py_ssize_t
levenshtein_distance(const char *a, size_t a_size,
const char *b, size_t b_size,
size_t max_cost)
size_t max_cost, size_t *buffer)
{
static size_t buffer[MAX_STRING_SIZE];
kumaraditya303 marked this conversation as resolved.
Show resolved Hide resolved

// Both strings are the same (by identity)
if (a == b) {
return 0;
Expand Down Expand Up @@ -147,12 +145,16 @@ calculate_suggestions(PyObject *dir,
if (name_str == NULL) {
return NULL;
}

size_t *buffer = PyMem_New(size_t, MAX_STRING_SIZE);
if (buffer == NULL) {
return PyErr_NoMemory();
}
for (int i = 0; i < dir_size; ++i) {
PyObject *item = PyList_GET_ITEM(dir, i);
Py_ssize_t item_size;
const char *item_str = PyUnicode_AsUTF8AndSize(item, &item_size);
if (item_str == NULL) {
PyMem_Free(buffer);
return NULL;
}
if (PyUnicode_CompareWithASCIIString(name, item_str) == 0) {
Expand All @@ -163,8 +165,8 @@ calculate_suggestions(PyObject *dir,
// Don't take matches we've already beaten.
max_distance = Py_MIN(max_distance, suggestion_distance - 1);
Py_ssize_t current_distance =
levenshtein_distance(name_str, name_size,
item_str, item_size, max_distance);
levenshtein_distance(name_str, name_size, item_str,
item_size, max_distance, buffer);
if (current_distance > max_distance) {
continue;
}
Expand All @@ -173,6 +175,7 @@ calculate_suggestions(PyObject *dir,
suggestion_distance = current_distance;
}
}
PyMem_Free(buffer);
return Py_XNewRef(suggestion);
}

Expand Down Expand Up @@ -238,7 +241,7 @@ get_suggestions_for_name_error(PyObject* name, PyFrameObject* frame)
if (!self) {
goto error;
}

if (PyObject_HasAttr(self, name)) {
Py_DECREF(dir);
return PyUnicode_FromFormat("self.%S", name);
Expand Down Expand Up @@ -401,6 +404,14 @@ _Py_UTF8_Edit_Cost(PyObject *a, PyObject *b, Py_ssize_t max_cost)
if (max_cost == -1) {
max_cost = MOVE_COST * Py_MAX(size_a, size_b);
}
return levenshtein_distance(utf8_a, size_a, utf8_b, size_b, max_cost);
size_t *buffer = PyMem_New(size_t, MAX_STRING_SIZE);
if (buffer == NULL) {
PyErr_NoMemory();
return -1;
}
Py_ssize_t res = levenshtein_distance(utf8_a, size_a,
utf8_b, size_b, max_cost, buffer);
PyMem_Free(buffer);
return res;
}