Move builtins methods as inlined into .pxd

Author: touilleMan

scripts/extension_api_parser/type.py

@@ -386,7 +386,7 @@ def register_classes_in_types_db(classes: Iterable["ClassSpec"]) -> None:
             gdapi_type=spec.original_name,
             py_type=spec.name,
             c_type="GDNativeObjectPtr",
-            cy_type="GDNativeObjectPtr",
+            cy_type="object",
             _variant_type_name="GDNATIVE_VARIANT_TYPE_OBJECT",
         )
         TYPES_DB[ts.gdapi_type] = ts

src/godot/builtins.macros.pxd.j2

@@ -0,0 +1,55 @@
+{% macro render_method_signature(spec, m) -%}
+{{ "void" if m.return_type.is_nil else m.return_type.cy_type }} {{ m.name }}(self
+{%- for arg in m.arguments -%}
+, {{ arg.type.cy_type }} {{ arg.name }}
+{%- endfor -%})
+{%- endmacro %}
+
+
+{% macro render_method(spec, m) %}
+cpdef inline {{ render_method_signature(spec, m) }}:
+{%   if m.contains_unsuported_types %}
+    raise NotImplementedError  # TODO
+{%   else %}
+{#  Return type #}
+{%   if m.return_type.is_nil %}
+{%   elif m.return_type.is_scalar %}
+    cdef {{ m.return_type.cy_type }} ret = 0
+{%   elif m.return_type.is_builtin %}
+    # Call to __new__ bypasses __init__ constructor
+    cdef {{ m.return_type.cy_type }} ret = {{ m.return_type.cy_type }}.__new__({{ m.return_type.cy_type }})
+{%   endif %}
+{#  Arguments #}
+{%   if (m.arguments | length) != 0 %}
+    cdef GDNativeTypePtr[{{ m.arguments | length }}] args = [
+{%     for arg in m.arguments %}
+{%       if arg.type.is_scalar %}
+        &{{ arg.name }},
+{%       else %}
+        &{{ arg.name }}._gd_data,
+{%       endif %}
+{%     endfor %}
+    ]
+{%   endif %}
+{#  Actual call ! #}
+    __{{ spec.name }}_meth_{{ m.name }}(
+{#      GDNativeTypePtr p_base #}
+        &self._gd_data,
+{#      const GDNativeTypePtr *p_args #}
+        {{ "NULL" if (m.arguments | length) == 0 else "args" }},
+{#      GDNativeTypePtr r_return #}
+{%   if m.return_type.is_nil %}
+        NULL,
+{%   elif m.return_type.is_scalar %}
+        &ret,
+{%   elif m.return_type.is_builtin %}
+        &ret._gd_data,
+{%   endif %}
+{#      int p_argument_count #}
+        {{ m.arguments | length }},
+    )
+{%   if not m.return_type.is_nil %}
+    return ret
+{%   endif %}
+{%   endif %}
+{% endmacro %}

src/godot/builtins.pxd.j2

@@ -1,7 +1,6 @@
-# /!\ Autogenerated code, modifications will be lost /!\
-# see `scripts/generate_tmpl.py`
-
+{%- from 'builtins.macros.pxd.j2' import render_method -%}
 cimport cython
+
 cdef extern from "Python.h":
     const char* PyUnicode_AsUTF8AndSize(object, size_t*)
     object PyUnicode_DecodeUTF32(const char *s, size_t size, const char *errors, int *byteorder)
@@ -47,4 +46,7 @@ cdef class {{ spec.name }}:
     cdef inline gd_string_t to_pystr(self):
         return gdstring_to_pystr(&self._gd_data)
 {% endif %}
+{% for m in spec.methods %}
+    {{ render_method(spec, m) | indent }}
+{% endfor %}
 {% endfor %}

src/godot/builtins_pyx/class.pxi.j2

@@ -121,59 +121,6 @@ def set_{{ m.name }}(self, {{ m.type.cy_type }} val not None):
 {% endmacro %}
 
 
-{#########################################################################
- # Render method
- #########################################################################}
-
-{% macro render_method(spec, m) %}
-def {{ m.name }}(self, {% for arg in m.arguments %}{{ arg.type.cy_type }} {{ arg.name }}, {% endfor %}):  # -> {{ "None" if m.return_type.is_nil else m.return_type.py_type }}
-{%   if m.contains_unsuported_types %}
-    raise NotImplementedError
-{%   else %}
-{#  Return type #}
-{%   if m.return_type.is_nil %}
-{%   elif m.return_type.is_scalar %}
-    cdef {{ m.return_type.cy_type }} ret = 0
-{%   elif m.return_type.is_builtin %}
-    # Call to __new__ bypasses __init__ constructor
-    cdef {{ m.return_type.cy_type }} ret = {{ m.return_type.cy_type }}.__new__({{ m.return_type.cy_type }})
-{%   endif %}
-{#  Arguments #}
-{%   if (m.arguments | length) != 0 %}
-    cdef GDNativeTypePtr[{{ m.arguments | length }}] args = [
-{%     for arg in m.arguments %}
-{%       if arg.type.is_scalar %}
-        &{{ arg.name }},
-{%       else %}
-        &{{ arg.name }}._gd_data,
-{%       endif %}
-{%     endfor %}
-    ]
-{%   endif %}
-{#  Actual call ! #}
-    __{{ spec.name }}_meth_{{ m.name }}(
-{#      GDNativeTypePtr p_base #}
-        &self._gd_data,
-{#      const GDNativeTypePtr *p_args #}
-        {{ "NULL" if (m.arguments | length) == 0 else "args" }},
-{#      GDNativeTypePtr r_return #}
-{%   if m.return_type.is_nil %}
-        NULL,
-{%   elif m.return_type.is_scalar %}
-        &ret,
-{%   elif m.return_type.is_builtin %}
-        &ret._gd_data,
-{%   endif %}
-{#      int p_argument_count #}
-        {{ m.arguments | length }},
-    )
-{%   if not m.return_type.is_nil %}
-    return ret
-{%   endif %}
-{%   endif %}
-{% endmacro %}
-
-
 {#########################################################################
  # Render full class spec
  #########################################################################}
@@ -224,8 +171,4 @@ cdef class {{ spec.name }}:
     # Methods
 
 {% endif %}
-{% for m in spec.methods %}
-    {{ render_method(spec, m) | indent }}
-{% endfor %}
-
 {%- endmacro %}

src/meson.build

@@ -89,7 +89,10 @@ pxd_godot_builtins = custom_target(
     output: 'godot#builtins.pxd',
     input: [
         generate_tmpl_base_input,
-        files('godot/builtins.pxd.j2'),
+        files(
+            'godot/builtins.pxd.j2',
+            'godot/builtins.macros.pxd.j2',
+        ),
     ],
     command: generate_tmpl_cmd,
 )