Commit 7669cb8b authored by Greg Price's avatar Greg Price Committed by Benjamin Peterson

bpo-38043: Use `bool` for boolean flags on is_normalized_quickcheck. (GH-15711)

parent 71ea688d
...@@ -795,7 +795,7 @@ typedef enum {YES = 0, MAYBE = 1, NO = 2} QuickcheckResult; ...@@ -795,7 +795,7 @@ typedef enum {YES = 0, MAYBE = 1, NO = 2} QuickcheckResult;
*/ */
static QuickcheckResult static QuickcheckResult
is_normalized_quickcheck(PyObject *self, PyObject *input, 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 /* An older version of the database is requested, quickchecks must be
disabled. */ disabled. */
...@@ -869,25 +869,25 @@ unicodedata_UCD_is_normalized_impl(PyObject *self, PyObject *form, ...@@ -869,25 +869,25 @@ unicodedata_UCD_is_normalized_impl(PyObject *self, PyObject *form,
} }
PyObject *result; PyObject *result;
int nfc = 0; bool nfc = false;
int k = 0; bool k = false;
QuickcheckResult m; QuickcheckResult m;
PyObject *cmp; PyObject *cmp;
int match = 0; int match = 0;
if (_PyUnicode_EqualToASCIIId(form, &PyId_NFC)) { if (_PyUnicode_EqualToASCIIId(form, &PyId_NFC)) {
nfc = 1; nfc = true;
} }
else if (_PyUnicode_EqualToASCIIId(form, &PyId_NFKC)) { else if (_PyUnicode_EqualToASCIIId(form, &PyId_NFKC)) {
nfc = 1; nfc = true;
k = 1; k = true;
} }
else if (_PyUnicode_EqualToASCIIId(form, &PyId_NFD)) { else if (_PyUnicode_EqualToASCIIId(form, &PyId_NFD)) {
/* matches default values for `nfc` and `k` */ /* matches default values for `nfc` and `k` */
} }
else if (_PyUnicode_EqualToASCIIId(form, &PyId_NFKD)) { else if (_PyUnicode_EqualToASCIIId(form, &PyId_NFKD)) {
k = 1; k = true;
} }
else { else {
PyErr_SetString(PyExc_ValueError, "invalid normalization form"); PyErr_SetString(PyExc_ValueError, "invalid normalization form");
...@@ -940,28 +940,28 @@ unicodedata_UCD_normalize_impl(PyObject *self, PyObject *form, ...@@ -940,28 +940,28 @@ unicodedata_UCD_normalize_impl(PyObject *self, PyObject *form,
} }
if (_PyUnicode_EqualToASCIIId(form, &PyId_NFC)) { 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); Py_INCREF(input);
return input; return input;
} }
return nfc_nfkc(self, input, 0); return nfc_nfkc(self, input, 0);
} }
if (_PyUnicode_EqualToASCIIId(form, &PyId_NFKC)) { 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); Py_INCREF(input);
return input; return input;
} }
return nfc_nfkc(self, input, 1); return nfc_nfkc(self, input, 1);
} }
if (_PyUnicode_EqualToASCIIId(form, &PyId_NFD)) { 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); Py_INCREF(input);
return input; return input;
} }
return nfd_nfkd(self, input, 0); return nfd_nfkd(self, input, 0);
} }
if (_PyUnicode_EqualToASCIIId(form, &PyId_NFKD)) { 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); Py_INCREF(input);
return input; return input;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment