@@ -795,7 +795,7 @@ typedef enum {YES = 0, MAYBE = 1, NO = 2} QuickcheckResult;
795
795
*/
796
796
static QuickcheckResult
797
797
is_normalized_quickcheck (PyObject * self , PyObject * input ,
798
- int nfc , int k , bool yes_only )
798
+ bool nfc , bool k , bool yes_only )
799
799
{
800
800
/* An older version of the database is requested, quickchecks must be
801
801
disabled. */
@@ -869,25 +869,25 @@ unicodedata_UCD_is_normalized_impl(PyObject *self, PyObject *form,
869
869
}
870
870
871
871
PyObject * result ;
872
- int nfc = 0 ;
873
- int k = 0 ;
872
+ bool nfc = false ;
873
+ bool k = false ;
874
874
QuickcheckResult m ;
875
875
876
876
PyObject * cmp ;
877
877
int match = 0 ;
878
878
879
879
if (_PyUnicode_EqualToASCIIId (form , & PyId_NFC )) {
880
- nfc = 1 ;
880
+ nfc = true ;
881
881
}
882
882
else if (_PyUnicode_EqualToASCIIId (form , & PyId_NFKC )) {
883
- nfc = 1 ;
884
- k = 1 ;
883
+ nfc = true ;
884
+ k = true ;
885
885
}
886
886
else if (_PyUnicode_EqualToASCIIId (form , & PyId_NFD )) {
887
887
/* matches default values for `nfc` and `k` */
888
888
}
889
889
else if (_PyUnicode_EqualToASCIIId (form , & PyId_NFKD )) {
890
- k = 1 ;
890
+ k = true ;
891
891
}
892
892
else {
893
893
PyErr_SetString (PyExc_ValueError , "invalid normalization form" );
@@ -940,28 +940,28 @@ unicodedata_UCD_normalize_impl(PyObject *self, PyObject *form,
940
940
}
941
941
942
942
if (_PyUnicode_EqualToASCIIId (form , & PyId_NFC )) {
943
- if (is_normalized_quickcheck (self , input , 1 , 0 , true) == YES ) {
943
+ if (is_normalized_quickcheck (self , input , true, false , true) == YES ) {
944
944
Py_INCREF (input );
945
945
return input ;
946
946
}
947
947
return nfc_nfkc (self , input , 0 );
948
948
}
949
949
if (_PyUnicode_EqualToASCIIId (form , & PyId_NFKC )) {
950
- if (is_normalized_quickcheck (self , input , 1 , 1 , true) == YES ) {
950
+ if (is_normalized_quickcheck (self , input , true, true, true) == YES ) {
951
951
Py_INCREF (input );
952
952
return input ;
953
953
}
954
954
return nfc_nfkc (self , input , 1 );
955
955
}
956
956
if (_PyUnicode_EqualToASCIIId (form , & PyId_NFD )) {
957
- if (is_normalized_quickcheck (self , input , 0 , 0 , true) == YES ) {
957
+ if (is_normalized_quickcheck (self , input , false, false , true) == YES ) {
958
958
Py_INCREF (input );
959
959
return input ;
960
960
}
961
961
return nfd_nfkd (self , input , 0 );
962
962
}
963
963
if (_PyUnicode_EqualToASCIIId (form , & PyId_NFKD )) {
964
- if (is_normalized_quickcheck (self , input , 0 , 1 , true) == YES ) {
964
+ if (is_normalized_quickcheck (self , input , false, true, true) == YES ) {
965
965
Py_INCREF (input );
966
966
return input ;
967
967
}
0 commit comments