Move builtins' clone constructors into the pxd

Author: touilleMan

src/godot/builtins_pxd/class.pxd.j2

@@ -1,10 +1,12 @@
+{% from 'builtins_pxd/constructor.pxd.j2' import render_constructors with context %}
 {% from 'builtins_pxd/method.pxd.j2' import render_method, render_method_signature with context %}
 {% from 'builtins_pxd/member.pxd.j2' import
     render_member,
     render_member_getter_signature,
     render_member_setter_signature
 with context %}
 
+
 {% macro render_class_resume(spec) %}
 # cdef class {{ spec.name }}:
 {% for m in spec.members %}
@@ -23,6 +25,8 @@ with context %}
 cdef class {{ spec.name }}:
     cdef {{ spec.c_struct_name }} _gd_data
 
+    {{ render_constructors(spec) | indent }}
+
     @staticmethod
     cdef inline {{ spec.name }} new():
         # Call to __new__ bypasses __init__ constructor

src/godot/builtins_pxd/constructor.pxd.j2

@@ -0,0 +1,25 @@
+{# In Godot you would do `var v2 = Vector2(v1)`, but it's more Pythonic #}
+{# to provide a clone method and do `v2 = v1.clone()` (and it simplifies #}
+{# constructor implementation !) #}
+{% macro render_clone_constructor(spec) -%}
+cpdef inline {{ spec.name }} clone(self):
+    cdef {{ spec.name }} obj = {{ spec.name }}.__new__({{ spec.name }})
+{% if spec.is_transparent_c_struct %}
+    obj._gd_data = self._gd_data
+{% else %}
+{# Opaque builtin, must retrieve and use the clone constructor function #}
+    cdef GDNativeTypePtr[1] args = [&self._gd_data]
+    __{{ spec.name }}_constructor_{{ spec.clone_constructor_index }}(&obj._gd_data, args)
+{% endif %}
+    return obj
+{%- endmacro %}
+
+
+{#########################################################################
+ # Render constructors
+ #########################################################################}
+
+
+{% macro render_constructors(spec) -%}
+{{ render_clone_constructor(spec) }}
+{% endmacro %}

src/godot/builtins_pyx/constructor.pyx.j2

@@ -1,8 +1,3 @@
-{#########################################################################
- # Render default constructor
- #########################################################################}
-
-
 {% macro render_default_constructor(spec) -%}
 {% if spec.is_transparent_c_struct %}
 
@@ -25,38 +20,11 @@ def __cinit__(self):
 {%- endmacro %}
 
 
-{#########################################################################
- # Render clone constructor
- #########################################################################}
-
-{# In Godot you would do `var v2 = Vector2(v1)`, but it's more Pythonic #}
-{# to provide a clone method and do `v2 = v1.clone()` (and it simplifies #}
-{# constructor implementation !) #}
-{% macro render_clone_constructor(spec) -%}
-def clone(self):
-    cdef {{ spec.name }} obj = {{ spec.name }}.__new__({{ spec.name }})
-{% if spec.is_transparent_c_struct %}
-    obj._gd_data = self._gd_data
-{% else %}
-{# Opaque builtin, must retrieve and use the clone constructor function #}
-    cdef GDNativeTypePtr[1] args = [&self._gd_data]
-    __{{ spec.name }}_constructor_{{ spec.clone_constructor_index }}(&obj._gd_data, args)
-{% endif %}
-    return obj
-{%- endmacro %}
-
-
-{#########################################################################
- # Render constructors
- #########################################################################}
-
-
 {% macro render_constructors(spec) -%}
 {# Default constructor #}
 {% if spec.name != "GDString" and not spec.is_packed_array %}
 {{ render_default_constructor(spec) }}
 {% endif %}
-{{ render_clone_constructor(spec) }}
 
 {# And now for the custom constructors ! #}
 

src/meson.build

@@ -92,6 +92,7 @@ pxd_godot_builtins = custom_target(
         files(
             'godot/builtins.pxd.j2',
             'godot/builtins_pxd/class.pxd.j2',
+            'godot/builtins_pxd/constructor.pxd.j2',
             'godot/builtins_pxd/member.pxd.j2',
             'godot/builtins_pxd/method.pxd.j2',
         ),