Switch to multi phase init

Author: ZeroIntensity

.clang-format

@@ -0,0 +1 @@
+DisableFormat: true

.gitignore

@@ -27,7 +27,7 @@ a.py
 # Logs
 *.log
 vgcore.*
-valgrind.txt
+valgrind.txt*
 
 # JavaScript
 node_modules/

include/view/backport.h

@@ -3,13 +3,17 @@
 
 #include <Python.h>
 
+#if PY_MAJOR_VERSION != 3
+#error "this file assumes python 3"
+#endif
+
 #ifndef _PyObject_Vectorcall
 #define VIEW_NEEDS_VECTORCALL
-PyObject* _PyObject_VectorcallBackport(
-    PyObject* obj,
-    PyObject** args,
+PyObject * _PyObject_VectorcallBackport(
+    PyObject *obj,
+    PyObject **args,
     size_t nargsf,
-    PyObject* kwargs
+    PyObject *kwargs
 );
 
 #define PyObject_CallNoArgs(o) PyObject_CallObject(o, NULL)
@@ -18,19 +22,19 @@ PyObject* _PyObject_VectorcallBackport(
 #endif
 
 #if PY_VERSION_HEX < 0x030c0000
-PyObject* PyErr_GetRaisedException(void);
-void PyErr_SetRaisedException(PyObject* err);
+PyObject * PyErr_GetRaisedException(void);
+void PyErr_SetRaisedException(PyObject *err);
 #endif
 
 #ifndef Py_NewRef
 #define VIEW_NEEDS_NEWREF
-PyObject* Py_NewRef_Backport(PyObject* o);
+PyObject * Py_NewRef_Backport(PyObject *o);
 #define Py_NewRef Py_NewRef_Backport
 #endif
 
 #ifndef Py_XNewRef
 #define VIEW_NEEDS_XNEWREF
-PyObject* Py_XNewRef_Backport(PyObject* o);
+PyObject * Py_XNewRef_Backport(PyObject *o);
 #define Py_XNewRef Py_XNewRef_Backport
 #endif
 
@@ -40,7 +44,25 @@ PyObject* Py_XNewRef_Backport(PyObject* o);
 
 #if PY_MINOR_VERSION == 8
 #define PyObject_CallOneArg(func, val) \
-    PyObject_Vectorcall(func, (PyObject*[]) { val }, 1, NULL)
+        PyObject_Vectorcall(func, (PyObject *[]) { val }, 1, NULL)
+#endif
+
+#if PY_MINOR_VERSION < 13
+static int
+PyModule_Add(PyObject *module, const char *name, PyObject *value)
+{
+    if (value == NULL)
+    {
+        return -1;
+    }
+    if (PyModule_AddObject(module, name, value) < 0)
+    {
+        Py_DECREF(value);
+        return -1;
+    }
+    return 0;
+}
+
 #endif
 
 #endif

include/view/context.h

@@ -4,6 +4,6 @@
 #include <Python.h> // PyObject, PyTypeObject
 
 extern PyTypeObject ContextType;
-PyObject* context_from_data(PyObject* app, PyObject* scope);
+PyObject * context_from_data(PyObject *app, PyObject *scope);
 
 #endif

include/view/inputs.h

@@ -5,49 +5,51 @@
 
 #include <view/typecodes.h> // type_info
 
-typedef struct _app_parsers {
-    PyObject* query;
-    PyObject* json;
+typedef struct _app_parsers
+{
+    PyObject *query;
+    PyObject *json;
 } app_parsers;
 
-int body_inc_buf(PyObject* awaitable, PyObject* result);
+int body_inc_buf(PyObject *awaitable, PyObject *result);
 
-PyObject* query_parser(
-    app_parsers* parsers,
-    const char* data
+PyObject * query_parser(
+    app_parsers *parsers,
+    const char *data
 );
 
-typedef struct _route_input {
+typedef struct _route_input
+{
     int route_data; // If this is above 0, assume all other items are undefined.
-    type_info** types;
+    type_info **types;
     Py_ssize_t types_size;
-    PyObject* df;
-    PyObject** validators;
+    PyObject *df;
+    PyObject **validators;
     Py_ssize_t validators_size;
-    char* name;
+    char *name;
     bool is_body;
 } route_input;
 
-PyObject* build_data_input(
+PyObject * build_data_input(
     int num,
-    PyObject* app,
-    PyObject* scope,
-    PyObject* receive,
-    PyObject* send
+    PyObject *app,
+    PyObject *scope,
+    PyObject *receive,
+    PyObject *send
 );
 
 typedef struct _ViewApp ViewApp; // Including "app.h" is a circular dependency
 
-PyObject** generate_params(
-    ViewApp* app,
-    app_parsers* parsers,
-    const char* data,
-    PyObject* query,
-    route_input** inputs,
+PyObject ** generate_params(
+    ViewApp *app,
+    app_parsers *parsers,
+    const char *data,
+    PyObject *query,
+    route_input **inputs,
     Py_ssize_t inputs_size,
-    PyObject* scope,
-    PyObject* receive,
-    PyObject* send
+    PyObject *scope,
+    PyObject *receive,
+    PyObject *send
 );
 
 #endif

include/view/map.h

@@ -3,26 +3,28 @@
 
 #include <Python.h> // Py_ssize_t
 
-typedef void (* map_free_func)(void*);
-typedef void (* map_print_func)(void*);
+typedef void (* map_free_func)(void *);
+typedef void (* map_print_func)(void *);
 
-typedef struct STRUCT_MAP_PAIR {
-    char* key;
-    void* value;
+typedef struct STRUCT_MAP_PAIR
+{
+    char *key;
+    void *value;
 } pair;
 
-typedef struct STRUCT_MAP {
+typedef struct STRUCT_MAP
+{
     Py_ssize_t len;
     Py_ssize_t capacity;
-    pair** items;
+    pair **items;
     map_free_func dealloc;
 } map;
 
-void* map_get(map* m, const char* key);
-map* map_new(Py_ssize_t inital_capacity, map_free_func dealloc);
-void map_set(map* m, const char* key, void* value);
-void map_free(map* m);
-map* map_copy(map* m);
-void print_map(map* m, map_print_func pr);
+void * map_get(map *m, const char *key);
+map * map_new(Py_ssize_t inital_capacity, map_free_func dealloc);
+void map_set(map *m, const char *key, void *value);
+void map_free(map *m);
+map * map_copy(map *m);
+void print_map(map *m, map_print_func pr);
 
 #endif

include/view/results.h

@@ -4,14 +4,14 @@
 #include <Python.h> // PyObject
 
 int handle_result(
-    PyObject* raw_result,
-    char** res_target,
-    int* status_target,
-    PyObject** headers_target,
-    PyObject* raw_path,
-    const char* method
+    PyObject *raw_result,
+    char **res_target,
+    int *status_target,
+    PyObject **headers_target,
+    PyObject *raw_path,
+    const char *method
 );
-char* pymem_strdup(const char* c, Py_ssize_t size);
-PyObject* build_default_headers();
+char * pymem_strdup(const char *c, Py_ssize_t size);
+PyObject * build_default_headers();
 
 #endif

include/view/typecodes.h

@@ -7,36 +7,39 @@
 typedef struct Route route; // route.h depends on this file
 extern PyTypeObject TCPublicType;
 
-typedef enum {
+typedef enum
+{
     STRING_ALLOWED = 1 << 0,
     NULL_ALLOWED = 2 << 0
 } typecode_flag;
 
 typedef struct _type_info type_info;
 
-struct _type_info {
+struct _type_info
+{
     uint8_t typecode;
-    PyObject* ob;
-    type_info** children;
+    PyObject *ob;
+    type_info **children;
     Py_ssize_t children_size;
-    PyObject* df;
+    PyObject *df;
 };
 
-bool figure_has_body(PyObject* inputs);
+bool figure_has_body(PyObject *inputs);
 
 int load_typecodes(
-    route* r,
-    PyObject* target
+    route *r,
+    PyObject *target
 );
 
-PyObject* cast_from_typecodes(
-    type_info** codes,
+PyObject *
+cast_from_typecodes(
+    type_info **codes,
     Py_ssize_t len,
-    PyObject* item,
-    PyObject* json_parser,
+    PyObject *item,
+    PyObject *json_parser,
     bool allow_casting
 );
-type_info** build_type_codes(PyObject* type_codes, Py_ssize_t len);
-void free_type_codes(type_info** codes, Py_ssize_t len);
+type_info ** build_type_codes(PyObject *type_codes, Py_ssize_t len);
+void free_type_codes(type_info **codes, Py_ssize_t len);
 
 #endif

include/view/view.h

@@ -4,20 +4,17 @@
 #include <Python.h> // PyObject
 
 void view_fatal(
-    const char* message,
-    const char* where,
-    const char* func,
+    const char *message,
+    const char *where,
+    const char *func,
     int lineno
 );
 
-extern PyObject* ip_address;
-extern PyObject* invalid_status_error;
-extern PyObject* route_log;
-extern PyObject* route_warn;
-extern PyObject* ws_cls;
-extern PyObject* ws_disconnect_err;
-extern PyObject* ws_err_cls;
-extern PyObject* default_headers;
+extern PyObject *ip_address;
+extern PyObject *invalid_status_error;
+extern PyObject *route_log;
+extern PyObject *route_warn;
+extern PyObject *default_headers;
 
 #if defined(__LINE__) && defined(__FILE__)
 #define VIEW_FATAL(msg) view_fatal(msg, __FILE__, __func__, __LINE__)

include/view/ws.h

@@ -5,6 +5,6 @@
 #include <view/backport.h>
 
 extern PyTypeObject WebSocketType;
-PyObject* ws_from_data(PyObject* scope, PyObject* send, PyObject* receive);
+PyObject * ws_from_data(PyObject *scope, PyObject *send, PyObject *receive);
 
 #endif