Refactor

Author: JukkaL

mypyc/lib-rt/librt_strings.c

@@ -307,58 +307,73 @@ BytesWriter_append_internal(BytesWriterObject *self, uint8_t value) {
 }
 
 static PyObject*
-BytesWriter_truncate(PyObject *self, PyObject *const *args, size_t nargs) {
-    if (unlikely(nargs != 1)) {
-        PyErr_Format(PyExc_TypeError,
-                     "truncate() takes exactly 1 argument (%zu given)", nargs);
+BytesWriter_append(PyObject *self, PyObject *const *args, size_t nargs, PyObject *kwnames) {
+    static const char * const kwlist[] = {"value", 0};
+    static CPyArg_Parser parser = {"O:append", kwlist, 0};
+    PyObject *value;
+    if (unlikely(!CPyArg_ParseStackAndKeywordsSimple(args, nargs, kwnames, &parser, &value))) {
         return NULL;
     }
     if (!check_bytes_writer(self)) {
         return NULL;
     }
-
-    PyObject *size_obj = args[0];
-    int overflow;
-    long long size = PyLong_AsLongLongAndOverflow(size_obj, &overflow);
-
-    if (size == -1 && PyErr_Occurred()) {
+    uint8_t unboxed = CPyLong_AsUInt8(value);
+    if (unlikely(unboxed == CPY_LL_UINT_ERROR && PyErr_Occurred())) {
+        CPy_TypeError("u8", value);
         return NULL;
     }
-    if (overflow != 0 || size < 0) {
-        PyErr_SetString(PyExc_ValueError, "size must be non-negative");
+    if (unlikely(BytesWriter_append_internal((BytesWriterObject *)self, unboxed) == CPY_NONE_ERROR)) {
         return NULL;
     }
+    Py_INCREF(Py_None);
+    return Py_None;
+}
 
+static char
+BytesWriter_truncate_internal(PyObject *self, int64_t size) {
     BytesWriterObject *writer = (BytesWriterObject *)self;
     Py_ssize_t current_size = writer->len;
 
+    // Validate size is non-negative
+    if (size < 0) {
+        PyErr_SetString(PyExc_ValueError, "size must be non-negative");
+        return CPY_NONE_ERROR;
+    }
+
+    // Validate size doesn't exceed current size
     if (size > current_size) {
         PyErr_SetString(PyExc_ValueError, "size cannot be larger than current buffer size");
-        return NULL;
+        return CPY_NONE_ERROR;
     }
 
     writer->len = size;
-    Py_INCREF(Py_None);
-    return Py_None;
+    return CPY_NONE;
 }
 
 static PyObject*
-BytesWriter_append(PyObject *self, PyObject *const *args, size_t nargs, PyObject *kwnames) {
-    static const char * const kwlist[] = {"value", 0};
-    static CPyArg_Parser parser = {"O:append", kwlist, 0};
-    PyObject *value;
-    if (unlikely(!CPyArg_ParseStackAndKeywordsSimple(args, nargs, kwnames, &parser, &value))) {
+BytesWriter_truncate(PyObject *self, PyObject *const *args, size_t nargs) {
+    if (unlikely(nargs != 1)) {
+        PyErr_Format(PyExc_TypeError,
+                     "truncate() takes exactly 1 argument (%zu given)", nargs);
         return NULL;
     }
     if (!check_bytes_writer(self)) {
         return NULL;
     }
-    uint8_t unboxed = CPyLong_AsUInt8(value);
-    if (unlikely(unboxed == CPY_LL_UINT_ERROR && PyErr_Occurred())) {
-        CPy_TypeError("u8", value);
+
+    PyObject *size_obj = args[0];
+    int overflow;
+    long long size = PyLong_AsLongLongAndOverflow(size_obj, &overflow);
+
+    if (size == -1 && PyErr_Occurred()) {
         return NULL;
     }
-    if (unlikely(BytesWriter_append_internal((BytesWriterObject *)self, unboxed) == CPY_NONE_ERROR)) {
+    if (overflow != 0) {
+        PyErr_SetString(PyExc_ValueError, "integer out of range");
+        return NULL;
+    }
+
+    if (unlikely(BytesWriter_truncate_internal(self, size) == CPY_NONE_ERROR)) {
         return NULL;
     }
     Py_INCREF(Py_None);
@@ -376,27 +391,6 @@ BytesWriter_len_internal(PyObject *self) {
     return writer->len << 1;
 }
 
-static char
-BytesWriter_truncate_internal(PyObject *self, int64_t size) {
-    BytesWriterObject *writer = (BytesWriterObject *)self;
-    Py_ssize_t current_size = writer->len;
-
-    // Validate size is non-negative
-    if (size < 0) {
-        PyErr_SetString(PyExc_ValueError, "size must be non-negative");
-        return CPY_NONE_ERROR;
-    }
-
-    // Validate size doesn't exceed current size
-    if (size > current_size) {
-        PyErr_SetString(PyExc_ValueError, "size cannot be larger than current buffer size");
-        return CPY_NONE_ERROR;
-    }
-
-    writer->len = size;
-    return CPY_NONE;
-}
-
 static PyMethodDef librt_strings_module_methods[] = {
     {NULL, NULL, 0, NULL}
 };