Put builtins pxd stuff in src/godot/builtins_pxd/

Author: touilleMan

src/godot/builtins.pxd.j2

@@ -1,4 +1,4 @@
-{%- from 'builtins.macros.pxd.j2' import render_method, render_member -%}
+{% from 'builtins_pxd/class.pxd.j2' import render_class with context %}
 cimport cython
 
 cdef extern from "Python.h":
@@ -30,26 +30,5 @@ cdef inline NodePath ensure_is_nodepath(object nodepath_or_pystr):
             raise TypeError(f"Invalid value {nodepath_or_pystr!r}, must be str or NodePath")
 {% for spec in api["builtins"] if not spec.is_scalar %}
 
-
-@cython.freelist(8)
-@cython.final
-cdef class {{ spec.name }}:
-    cdef {{ spec.c_struct_name }} _gd_data
-
-    @staticmethod
-    cdef inline {{ spec.name }} new():
-        # Call to __new__ bypasses __init__ constructor
-        cdef {{ spec.name }} ret = {{ spec.name }}.__new__({{ spec.name }})
-        __{{ spec.name }}_constructor_0(&ret._gd_data, NULL)
-        return ret
-{% if spec.name == "GDString" %}
-    cdef inline gd_string_t to_pystr(self):
-        return gdstring_to_pystr(&self._gd_data)
-{% endif %}
-{% for m in spec.members %}
-    {{ render_member(spec, m) | indent }}
-{% endfor %}
-{% for m in spec.methods %}
-    {{ render_method(spec, m) | indent }}
-{% endfor %}
+{{ render_class(spec) }}
 {% endfor %}

src/godot/builtins_pxd/class.pxd.j2

@@ -0,0 +1,27 @@
+{% from 'builtins_pxd/method.pxd.j2' import render_method with context %}
+{% from 'builtins_pxd/member.pxd.j2' import render_member with context %}
+
+
+{% macro render_class(spec, m) %}
+@cython.freelist(8)
+@cython.final
+cdef class {{ spec.name }}:
+    cdef {{ spec.c_struct_name }} _gd_data
+
+    @staticmethod
+    cdef inline {{ spec.name }} new():
+        # Call to __new__ bypasses __init__ constructor
+        cdef {{ spec.name }} ret = {{ spec.name }}.__new__({{ spec.name }})
+        __{{ spec.name }}_constructor_0(&ret._gd_data, NULL)
+        return ret
+{% if spec.name == "GDString" %}
+    cdef inline gd_string_t to_pystr(self):
+        return gdstring_to_pystr(&self._gd_data)
+{% endif %}
+{% for m in spec.members %}
+    {{ render_member(spec, m) | indent }}
+{% endfor %}
+{% for m in spec.methods %}
+    {{ render_method(spec, m) | indent }}
+{% endfor %}
+{% endmacro %}

src/godot/builtins_pxd/member.pxd.j2

@@ -0,0 +1,33 @@
+{% macro render_member_getter_signature(spec, m) -%}
+{{ m.type.cy_type }} get_{{ m.name }}(self)
+{%- endmacro %}
+
+
+{% macro render_member_setter_signature(spec, m) -%}
+void set_{{ m.name }}(self, {{ m.type.cy_type }} val)
+{%- endmacro %}
+
+
+{% macro render_member(spec, m) %}
+{% if not m.is_in_struct %}
+{# Property unrelated to the builtin internal structure, must use Godot API method to access it #}
+{%   if m.type.is_scalar %}
+{# Scalar type accessed by property (unused in extension_api.json afaik) #}
+cdef inline {{ render_member_getter_signature(spec, m) }}:
+    cdef {{ m.type.c_type }} ret
+    __{{ spec.name }}_get_{{ m.name }}(&self._gd_data, &ret)
+    return ret
+cdef inline {{ render_member_setter_signature(spec,m )}}:
+    __{{ spec.name }}_set_{{ m.name }}(&self._gd_data, &val)
+{%   else %}
+{# Builtin type in the C structure (i.e. `Rect2i.end`) #}
+cdef inline {{ render_member_getter_signature(spec, m) }}:
+    # Call to __new__ bypasses __init__ constructor
+    cdef {{ m.type.cy_type }} ret = {{ m.type.cy_type }}.__new__({{ m.type.cy_type }})
+    __{{ spec.name }}_get_{{ m.name }}(&self._gd_data, &ret._gd_data)
+    return ret
+cdef inline {{ render_member_setter_signature(spec,m )}}:
+    __{{ spec.name }}_set_{{ m.name }}(&self._gd_data, &val._gd_data)
+{%   endif %}
+{% endif %}
+{% endmacro %}

src/godot/builtins.macros.pxd.j2 renamed to src/godot/builtins_pxd/method.pxd.j2

@@ -1,8 +1,3 @@
-#########################################################################
-# Render method
-#########################################################################
-
-
 {% 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 -%}
@@ -58,43 +53,3 @@ cpdef inline {{ render_method_signature(spec, m) }}:
 {%   endif %}
 {%   endif %}
 {% endmacro %}
-
-
-#########################################################################
-# Render member
-#########################################################################
-
-
-{% macro render_member_getter_signature(spec, m) -%}
-{{ m.type.cy_type }} get_{{ m.name }}(self)
-{%- endmacro %}
-
-
-{% macro render_member_setter_signature(spec, m) -%}
-void set_{{ m.name }}(self, {{ m.type.cy_type }} val)
-{%- endmacro %}
-
-
-{% macro render_member(spec, m) %}
-{% if not m.is_in_struct %}
-{# Property unrelated to the builtin internal structure, must use Godot API method to access it #}
-{%   if m.type.is_scalar %}
-{# Scalar type accessed by property (unused in extension_api.json afaik) #}
-cdef inline {{ render_member_getter_signature(spec, m) }}:
-    cdef {{ m.type.c_type }} ret
-    __{{ spec.name }}_get_{{ m.name }}(&self._gd_data, &ret)
-    return ret
-cdef inline {{ render_member_setter_signature(spec,m )}}:
-    __{{ spec.name }}_set_{{ m.name }}(&self._gd_data, &val)
-{%   else %}
-{# Builtin type in the C structure (i.e. `Rect2i.end`) #}
-cdef inline {{ render_member_getter_signature(spec, m) }}:
-    # Call to __new__ bypasses __init__ constructor
-    cdef {{ m.type.cy_type }} ret = {{ m.type.cy_type }}.__new__({{ m.type.cy_type }})
-    __{{ spec.name }}_get_{{ m.name }}(&self._gd_data, &ret._gd_data)
-    return ret
-cdef inline {{ render_member_setter_signature(spec,m )}}:
-    __{{ spec.name }}_set_{{ m.name }}(&self._gd_data, &val._gd_data)
-{%   endif %}
-{% endif %}
-{% endmacro %}

src/meson.build

@@ -91,7 +91,9 @@ pxd_godot_builtins = custom_target(
         generate_tmpl_base_input,
         files(
             'godot/builtins.pxd.j2',
-            'godot/builtins.macros.pxd.j2',
+            'godot/builtins_pxd/class.pxd.j2',
+            'godot/builtins_pxd/member.pxd.j2',
+            'godot/builtins_pxd/method.pxd.j2',
         ),
     ],
     command: generate_tmpl_cmd,