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.

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

bpo-38043: Use bool for boolean flags on is_normalized_quickcheck. #15711

Merged
merged 1 commit into from
Sep 9, 2019
Merged

bpo-38043: Use bool for boolean flags on is_normalized_quickcheck. #15711

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
22 changes: 11 additions & 11 deletions Modules/unicodedata.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -795,7 +795,7 @@ typedef enum {YES = 0, MAYBE = 1, NO = 2} QuickcheckResult;
*/
static QuickcheckResult
is_normalized_quickcheck(PyObject *self, PyObject *input,
int nfc, int k, bool yes_only)
bool nfc, bool k, bool yes_only)
{
/* An older version of the database is requested, quickchecks must be
disabled. */
Expand Down Expand Up @@ -869,25 +869,25 @@ unicodedata_UCD_is_normalized_impl(PyObject *self, PyObject *form,
}

PyObject *result;
int nfc = 0;
int k = 0;
bool nfc = false;
bool k = false;
QuickcheckResult m;

PyObject *cmp;
int match = 0;

if (_PyUnicode_EqualToASCIIId(form, &PyId_NFC)) {
nfc = 1;
nfc = true;
}
else if (_PyUnicode_EqualToASCIIId(form, &PyId_NFKC)) {
nfc = 1;
k = 1;
nfc = true;
k = true;
}
else if (_PyUnicode_EqualToASCIIId(form, &PyId_NFD)) {
/* matches default values for `nfc` and `k` */
}
else if (_PyUnicode_EqualToASCIIId(form, &PyId_NFKD)) {
k = 1;
k = true;
}
else {
PyErr_SetString(PyExc_ValueError, "invalid normalization form");
Expand Down Expand Up @@ -940,28 +940,28 @@ unicodedata_UCD_normalize_impl(PyObject *self, PyObject *form,
}

if (_PyUnicode_EqualToASCIIId(form, &PyId_NFC)) {
if (is_normalized_quickcheck(self, input, 1, 0, true) == YES) {
if (is_normalized_quickcheck(self, input, true, false, true) == YES) {
Py_INCREF(input);
return input;
}
return nfc_nfkc(self, input, 0);
}
if (_PyUnicode_EqualToASCIIId(form, &PyId_NFKC)) {
if (is_normalized_quickcheck(self, input, 1, 1, true) == YES) {
if (is_normalized_quickcheck(self, input, true, true, true) == YES) {
Py_INCREF(input);
return input;
}
return nfc_nfkc(self, input, 1);
}
if (_PyUnicode_EqualToASCIIId(form, &PyId_NFD)) {
if (is_normalized_quickcheck(self, input, 0, 0, true) == YES) {
if (is_normalized_quickcheck(self, input, false, false, true) == YES) {
Py_INCREF(input);
return input;
}
return nfd_nfkd(self, input, 0);
}
if (_PyUnicode_EqualToASCIIId(form, &PyId_NFKD)) {
if (is_normalized_quickcheck(self, input, 0, 1, true) == YES) {
if (is_normalized_quickcheck(self, input, false, true, true) == YES) {
Py_INCREF(input);
return input;
}
Expand Down