[GR-52100] [GR-51580] Refactor PyMethodDef an PyCFunction wrappers.

PullRequest: graalpython/3198

Author: fangerer

graalpython/com.oracle.graal.python.cext/src/descrobject.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -41,13 +41,13 @@
 #include "capi.h"
 
 PyObject* PyDescr_NewClassMethod(PyTypeObject *type, PyMethodDef *method) {
-    int flags = PyMethodDef_ml_flags(method);
+    int flags = method->ml_flags;
     return GraalPyTruffleDescr_NewClassMethod(method,
-                    PyMethodDef_ml_name(method),
-					PyMethodDef_ml_doc(method),
+                    method->ml_name,
+                    method->ml_doc,
                     flags,
                     get_method_flags_wrapper(flags),
-					PyMethodDef_ml_meth(method),
+                    method->ml_meth,
                     type);
 }
 
@@ -59,20 +59,20 @@ PyObject* PyDescr_NewGetSet(PyTypeObject *type, PyGetSetDef *getset) {
                     getter_fun,
                     setter_fun,
                     PyGetSetDef_doc(getset),
-					PyGetSetDef_closure(getset));
+                    PyGetSetDef_closure(getset));
 }
 
 
 PyMethodDef* PyMethodDescrObject_GetMethod(PyObject* descr) {
-	return PyMethodDescrObject_d_method(descr);
+    return PyMethodDescrObject_d_method(descr);
 }
 
 PyTypeObject* PyDescrObject_GetType(PyObject* descr) {
-	return PyDescrObject_d_type(descr);
+    return PyDescrObject_d_type(descr);
 }
 
 PyObject* PyDescrObject_GetName(PyObject* descr) {
-	return PyDescrObject_d_name(descr);
+    return PyDescrObject_d_name(descr);
 }
 
 int PyDescr_IsData(PyObject *ob) {

graalpython/com.oracle.graal.python.cext/src/methodobject.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -57,35 +57,34 @@ PyObject *PyCFunction_NewEx(PyMethodDef *ml, PyObject *self, PyObject *module) {
 
 
 PyObject* PyCMethod_New(PyMethodDef *ml, PyObject *self, PyObject *module, PyTypeObject *cls) {
-    return GraalPyTruffleCMethod_NewEx(ml,
-                                               PyMethodDef_ml_name(ml),
-											   PyMethodDef_ml_meth(ml),
-											   PyMethodDef_ml_flags(ml),
-											   get_method_flags_wrapper(PyMethodDef_ml_flags(ml)),
-                                               self,
-                                               module,
-                                               cls,
-											   PyMethodDef_ml_doc(ml));
+    return GraalPyTruffleCMethod_NewEx(ml, ml->ml_name,
+                                           ml->ml_meth,
+                                           ml->ml_flags,
+                                           get_method_flags_wrapper(ml->ml_flags),
+                                           self,
+                                           module,
+                                           cls,
+                                           ml->ml_doc);
 }
 
 PyCFunction PyCFunction_GetFunction(PyObject *func) {
-	PyMethodDef* def = PyCFunctionObject_m_ml(func);
-	return PyMethodDef_ml_meth(def);
+    PyMethodDef* def = PyCFunctionObject_m_ml(func);
+    return def->ml_meth;
 }
 
 PyObject * PyCFunction_GetSelf(PyObject *func) {
-	PyMethodDef* def = PyCFunctionObject_m_ml(func);
-	return PyMethodDef_ml_flags(def) & METH_STATIC ? NULL : PyCFunctionObject_m_self(func);
+    PyMethodDef* def = PyCFunctionObject_m_ml(func);
+    return def->ml_flags & METH_STATIC ? NULL : PyCFunctionObject_m_self(func);
 }
 
 int PyCFunction_GetFlags(PyObject *func) {
-	PyMethodDef* def = PyCFunctionObject_m_ml(func);
-	return PyMethodDef_ml_flags(def);
+    PyMethodDef* def = PyCFunctionObject_m_ml(func);
+    return def->ml_flags;
 }
 
 PyTypeObject * PyCMethod_GetClass(PyObject *func) {
-	PyMethodDef* def = PyCFunctionObject_m_ml(func);
-	return PyMethodDef_ml_flags(def) & METH_METHOD ? PyCMethodObject_mm_class(func) : NULL;
+    PyMethodDef* def = PyCFunctionObject_m_ml(func);
+    return def->ml_flags & METH_METHOD ? PyCMethodObject_mm_class(func) : NULL;
 }
 
 PyObject* _PyCFunction_GetModule(PyObject *func) {