Use new helpers in the xmlcharrefreplace handler.

Author: picnixz

Python/codecs.c

@@ -730,6 +730,56 @@ codec_handler_write_unicode_hex(Py_UCS1 **p, Py_UCS4 ch)
 }
 
 
+static inline void
+codec_handler_unicode_log10_max(Py_UCS4 ch, uint64_t *base, uint64_t *digits)
+{
+#define MAKE_BRANCH(D, N)           \
+    do {                            \
+        if (ch < (N)) {             \
+            if (base != NULL) {     \
+                *base = (N);        \
+            }                       \
+            if (digits != NULL) {   \
+                *digits = (D);      \
+            }                       \
+        }                           \
+    } while (0)
+    MAKE_BRANCH(1, 10);
+    MAKE_BRANCH(2, 100);
+    MAKE_BRANCH(3, 1000);
+    MAKE_BRANCH(4, 10000);
+    MAKE_BRANCH(5, 100000);
+    MAKE_BRANCH(6, 1000000);
+    MAKE_BRANCH(7, 10000000);
+#undef MAKE_BRANCH
+    Py_UNREACHABLE();
+}
+
+
+/*
+ * Write the decimal representation of 'ch' to the buffer pointed by 'p'
+ * using at most 7 characters prefixed by '&#' and suffixed by ';'.
+ */
+static inline void
+codec_handler_write_unicode_dec(Py_UCS1 **p, Py_UCS4 ch)
+{
+    uint64_t base = 0, digits = 0;
+    codec_handler_unicode_log10_max(ch, &base, &digits);
+    assert(base != 0 && digits != 0);
+    assert(digits <= 7);
+
+    *(*p)++ = '&';
+    *(*p)++ = '#';
+    while (digits-- > 0) {
+        assert(base >= 1);
+        *(*p)++ = '0' + ch / base;
+        ch %= base;
+        base /= 10;
+    }
+    *(*p)++ = ';';
+}
+
+
 // --- handler: 'strict' ------------------------------------------------------
 
 PyObject *PyCodec_StrictErrors(PyObject *exc)
@@ -825,9 +875,12 @@ PyObject *PyCodec_ReplaceErrors(PyObject *exc)
     }
 }
 
+
+// --- handler: 'xmlcharrefreplace' -------------------------------------------
+
 PyObject *PyCodec_XMLCharRefReplaceErrors(PyObject *exc)
 {
-    if (!PyObject_TypeCheck(exc, (PyTypeObject *)PyExc_UnicodeEncodeError)) {
+    if (!_PyIsUnicodeEncodeError(exc)) {
         wrong_exception_type(exc);
         return NULL;
     }
@@ -856,28 +909,11 @@ PyObject *PyCodec_XMLCharRefReplaceErrors(PyObject *exc)
     for (Py_ssize_t i = start; i < end; ++i) {
         /* object is guaranteed to be "ready" */
         Py_UCS4 ch = PyUnicode_READ_CHAR(obj, i);
-        if (ch < 10) {
-            ressize += 2 + 1 + 1;
-        }
-        else if (ch < 100) {
-            ressize += 2 + 2 + 1;
-        }
-        else if (ch < 1000) {
-            ressize += 2 + 3 + 1;
-        }
-        else if (ch < 10000) {
-            ressize += 2 + 4 + 1;
-        }
-        else if (ch < 100000) {
-            ressize += 2 + 5 + 1;
-        }
-        else if (ch < 1000000) {
-            ressize += 2 + 6 + 1;
-        }
-        else {
-            assert(ch < 10000000);
-            ressize += 2 + 7 + 1;
-        }
+        uint64_t k = 0;
+        codec_handler_unicode_log10_max(ch, NULL, &k);
+        assert(k != 0);
+        assert(k <= 7);
+        ressize += 2 + k + 1;
     }
 
     /* allocate replacement */
@@ -889,46 +925,8 @@ PyObject *PyCodec_XMLCharRefReplaceErrors(PyObject *exc)
     Py_UCS1 *outp = PyUnicode_1BYTE_DATA(res);
     /* generate replacement */
     for (Py_ssize_t i = start; i < end; ++i) {
-        int digits, base;
         Py_UCS4 ch = PyUnicode_READ_CHAR(obj, i);
-        if (ch < 10) {
-            digits = 1;
-            base = 1;
-        }
-        else if (ch < 100) {
-            digits = 2;
-            base = 10;
-        }
-        else if (ch < 1000) {
-            digits = 3;
-            base = 100;
-        }
-        else if (ch < 10000) {
-            digits = 4;
-            base = 1000;
-        }
-        else if (ch < 100000) {
-            digits = 5;
-            base = 10000;
-        }
-        else if (ch < 1000000) {
-            digits = 6;
-            base = 100000;
-        }
-        else {
-            assert(ch < 10000000);
-            digits = 7;
-            base = 1000000;
-        }
-        *outp++ = '&';
-        *outp++ = '#';
-        while (digits-- > 0) {
-            assert(base >= 1);
-            *outp++ = '0' + ch / base;
-            ch %= base;
-            base /= 10;
-        }
-        *outp++ = ';';
+        codec_handler_write_unicode_dec(&outp, ch);
     }
     assert(_PyUnicode_CheckConsistency(res, 1));
     PyObject *restuple = Py_BuildValue("(Nn)", res, end);
@@ -1419,7 +1417,8 @@ static PyObject *replace_errors(PyObject *self, PyObject *exc)
 }
 
 
-static PyObject *xmlcharrefreplace_errors(PyObject *self, PyObject *exc)
+static inline PyObject *
+xmlcharrefreplace_errors(PyObject *Py_UNUSED(self), PyObject *exc)
 {
     return PyCodec_XMLCharRefReplaceErrors(exc);
 }