Merge pull request #2731 from itzpr3d4t0r/reorganize-geometry-internals

Reorganize geometry internals

Author: itzpr3d4t0r

src_c/circle.c

@@ -1,5 +1,5 @@
-#include "geometry.h"
 #include "doc/geometry_doc.h"
+#include "geometry_common.h"
 
 static PyObject *
 _pg_circle_subtype_new(PyTypeObject *type, pgCircleBase *circle)
@@ -27,176 +27,6 @@ _pg_circle_subtype_new3(PyTypeObject *type, double x, double y, double r)
     return (PyObject *)circle_obj;
 }
 
-static int
-_pg_circle_set_radius(PyObject *value, pgCircleBase *circle)
-{
-    double radius = 0;
-    if (!pg_DoubleFromObj(value, &radius) || radius <= 0) {
-        return 0;
-    }
-    circle->r = radius;
-
-    return 1;
-}
-
-static int
-pgCircle_FromObject(PyObject *obj, pgCircleBase *out)
-{
-    Py_ssize_t length;
-
-    if (pgCircle_Check(obj)) {
-        *out = pgCircle_AsCircle(obj);
-        return 1;
-    }
-
-    /* Paths for sequences */
-    if (pgSequenceFast_Check(obj)) {
-        PyObject **f_arr = PySequence_Fast_ITEMS(obj);
-        length = PySequence_Fast_GET_SIZE(obj);
-
-        if (length == 3) {
-            if (!pg_DoubleFromObj(f_arr[0], &out->x) ||
-                !pg_DoubleFromObj(f_arr[1], &out->y) ||
-                !_pg_circle_set_radius(f_arr[2], out)) {
-                return 0;
-            }
-            return 1;
-        }
-        else if (length == 1) {
-            if (!pgCircle_FromObject(f_arr[0], out)) {
-                return 0;
-            }
-            return 1;
-        }
-        else if (length == 2) {
-            if (!pg_TwoDoublesFromObj(f_arr[0], &out->x, &out->y) ||
-                !_pg_circle_set_radius(f_arr[1], out)) {
-                return 0;
-            }
-            return 1;
-        }
-        else {
-            /* Sequences of size other than 3 or 1 are not supported
-            (don't wanna support infinite sequence nesting anymore)*/
-            return 0;
-        }
-    }
-    else if (PySequence_Check(obj)) {
-        PyObject *tmp = NULL;
-        length = PySequence_Length(obj);
-        if (length == 3) {
-            /*These are to be substituted with better pg_DoubleFromSeqIndex()
-             * implementations*/
-            tmp = PySequence_ITEM(obj, 0);
-            if (!pg_DoubleFromObj(tmp, &out->x)) {
-                Py_DECREF(tmp);
-                return 0;
-            }
-            Py_DECREF(tmp);
-
-            tmp = PySequence_ITEM(obj, 1);
-            if (!pg_DoubleFromObj(tmp, &out->y)) {
-                Py_DECREF(tmp);
-                return 0;
-            }
-            Py_DECREF(tmp);
-
-            tmp = PySequence_ITEM(obj, 2);
-            if (!_pg_circle_set_radius(tmp, out)) {
-                Py_DECREF(tmp);
-                return 0;
-            }
-            Py_DECREF(tmp);
-
-            return 1;
-        }
-        else if (length == 2) {
-            tmp = PySequence_ITEM(obj, 0);
-            if (!pg_TwoDoublesFromObj(tmp, &out->x, &out->y)) {
-                Py_DECREF(tmp);
-                return 0;
-            }
-            Py_DECREF(tmp);
-
-            tmp = PySequence_ITEM(obj, 1);
-            if (!_pg_circle_set_radius(tmp, out)) {
-                Py_DECREF(tmp);
-                return 0;
-            }
-            Py_DECREF(tmp);
-
-            return 1;
-        }
-        else if (length == 1) {
-            tmp = PySequence_ITEM(obj, 0);
-            if (PyUnicode_Check(obj) || !pgCircle_FromObject(tmp, out)) {
-                Py_DECREF(tmp);
-                return 0;
-            }
-            Py_DECREF(tmp);
-            return 1;
-        }
-        else {
-            /* Sequences of size other than 3 or 1 are not supported
-            (don't wanna support infinite sequence nesting anymore)*/
-            return 0;
-        }
-    }
-
-    /* Path for objects that have a circle attribute */
-    PyObject *circleattr;
-    if (!(circleattr = PyObject_GetAttrString(obj, "circle"))) {
-        PyErr_Clear();
-        return 0;
-    }
-
-    if (PyCallable_Check(circleattr)) /*call if it's a method*/
-    {
-        PyObject *circleresult = PyObject_CallObject(circleattr, NULL);
-        Py_DECREF(circleattr);
-        if (!circleresult) {
-            PyErr_Clear();
-            return 0;
-        }
-        circleattr = circleresult;
-    }
-
-    if (!pgCircle_FromObject(circleattr, out)) {
-        PyErr_Clear();
-        Py_DECREF(circleattr);
-        return 0;
-    }
-
-    Py_DECREF(circleattr);
-
-    return 1;
-}
-
-static int
-pgCircle_FromObjectFastcall(PyObject *const *args, Py_ssize_t nargs,
-                            pgCircleBase *out)
-{
-    if (nargs == 1) {
-        return pgCircle_FromObject(args[0], out);
-    }
-    else if (nargs == 2) {
-        if (!pg_TwoDoublesFromObj(args[0], &out->x, &out->y) ||
-            !_pg_circle_set_radius(args[1], out)) {
-            return 0;
-        }
-        return 1;
-    }
-    else if (nargs == 3) {
-        if (!pg_DoubleFromObj(args[0], &out->x) ||
-            !pg_DoubleFromObj(args[1], &out->y) ||
-            !_pg_circle_set_radius(args[2], out)) {
-            return 0;
-        }
-        return 1;
-    }
-    return 0;
-}
-
 static PyObject *
 pg_circle_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
 {

src_c/collisions.c

@@ -1,6 +1,5 @@
-#include "geometry.h"
-#include "collisions.c"
 #include "circle.c"
+#include "geometry_common.c"
 
 static PyMethodDef geometry_methods[] = {{NULL, NULL, 0, NULL}};
 

src_c/collisions.h

@@ -21,13 +21,6 @@ typedef struct {
 #define pgCircle_Check(o) ((o)->ob_type == &pgCircle_Type)
 
 static PyTypeObject pgCircle_Type;
-
-static int
-pgCircle_FromObject(PyObject *obj, pgCircleBase *out);
-
-static int
-pgCircle_FromObjectFastcall(PyObject *const *args, Py_ssize_t nargs,
-                            pgCircleBase *out);
 /* Constants */
 
 /* PI */