Put builtins pyx stuff in src/godot/builtins_pyx/

Author: touilleMan

src/godot/builtins.pxd.j2

@@ -1,4 +1,11 @@
-{% from 'builtins_pxd/class.pxd.j2' import render_class with context %}
+{% from 'builtins_pxd/class.pxd.j2' import render_class, render_class_resume with context %}
+{% for spec in api["builtins"] if not spec.is_scalar %}
+#
+#
+{{ render_class_resume(spec) }}
+{% endfor %}
+
+
 cimport cython
 
 cdef extern from "Python.h":

src/godot/builtins.pyx.j2

@@ -1,7 +1,4 @@
-{%- from 'builtins_pyx/class.pxi.j2' import render_spec with context -%}
-# /!\ Autogenerated code, modifications will be lost /!\
-# see `scripts/generate_tmpl.py`
-
+{%- from 'builtins_pyx/class.pyx.j2' import render_class with context -%}
 cimport cython
 from libc.math cimport INFINITY as inf  # Needed by some constants
 
@@ -10,5 +7,5 @@ from .hazmat.gdapi cimport *
 
 
 {% for spec in api["builtins"] if not spec.is_scalar -%}
-{{     render_spec(spec) }}
+{{     render_class(spec) }}
 {% endfor %}

src/godot/builtins_pxd/class.pxd.j2

@@ -1,5 +1,20 @@
-{% from 'builtins_pxd/method.pxd.j2' import render_method with context %}
-{% from 'builtins_pxd/member.pxd.j2' import render_member 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 %}
+#    {{ render_member_getter_signature(spec, m) }}
+#    {{ render_member_setter_signature(spec, m) }}
+{% endfor %}
+{% for m in spec.methods %}
+#    {{ render_method_signature(spec, m) }}
+{% endfor %}
+{% endmacro %}
 
 
 {% macro render_class(spec, m) %}

src/godot/builtins_pyx/class.pyx.j2

@@ -0,0 +1,55 @@
+{%- from 'builtins_pyx/constructor.pyx.j2' import render_constructors with context -%}
+{%- from 'builtins_pyx/member.pyx.j2' import render_member with context -%}
+
+
+{% macro render_constant(spec, c) %}
+{%   if c.type.is_scalar %}
+{{ c.name }} = {{ c.value }}
+{%   else %}
+@property
+def {{ c.name }}(self):
+    return {{ c.value }}
+{%   endif %}
+{% endmacro %}
+
+
+{% macro render_class(spec) -%}
+
+@cython.freelist(8)
+@cython.final
+cdef class {{ spec.name }}:
+    # Constructors
+    {{ render_constructors(spec) | indent }}
+
+{% if spec.has_destructor %}
+    # Destructor
+    def __dealloc__({{ spec.name }} self):
+        # /!\ if `__cinit__` is skipped, `_gd_data` must be initialized by
+        # hand otherwise we will get a segfault here
+        __{{ spec.name }}_destructor(&self._gd_data)
+{% endif %}
+
+    def __repr__(self):
+        # TODO: finish me...
+        # pythonscript_gdapi.variant_stringify(&self._gd_data)
+        return "<{{ spec.name }}>"
+{% if spec.name == "GDString" %}
+    def __str__(self):
+        self.to_pystr()
+{% endif %}
+{% if spec.constants %}
+    # Constants
+
+{% endif %}
+{% for c in spec.constants %}
+    {{ render_constant(spec, c) | indent }}
+{% endfor %}
+
+{% if spec.members %}
+    # Members
+
+{% endif %}
+{% for m in spec.members %}
+    {{ render_member(spec, m) | indent }}
+{% endfor %}
+{%- endmacro %}

src/godot/builtins_pyx/constructor.pxi.j2 renamed to src/godot/builtins_pyx/constructor.pyx.j2

@@ -1,27 +1,3 @@
-{%- from 'builtins_pyx/constructor.pxi.j2' import render_constructors with context -%}
-
-
-{#########################################################################
- # Render constant
- #########################################################################}
-
-
-{% macro render_constant(spec, c) %}
-{%   if c.type.is_scalar %}
-{{ c.name }} = {{ c.value }}
-{%   else %}
-@property
-def {{ c.name }}(self):
-    return {{ c.value }}
-{%   endif %}
-{% endmacro %}
-
-
-{#########################################################################
- # Render transparent builtin scalar property
- #########################################################################}
-
-
 {% macro render_transparent_builtin_scalar_property(m, name_prefix, access_prefix) -%}
 @property
 def {{ name_prefix }}{{ m.name }}(self):
@@ -32,11 +8,6 @@ def {{ name_prefix }}{{ m.name }}(self, {{ m.type.cy_type }} val):
 {% endmacro %}
 
 
-{#########################################################################
- # Render transparent builtin subtype properties
- #########################################################################}
-
-
 {% macro render_transparent_builtin_subtype_properties(m, name_prefix, access_prefix) -%}
 {% for subm in m.type.builtin_spec.c_struct_members %}
 {%   if subm.is_in_struct %}
@@ -50,11 +21,6 @@ def {{ name_prefix }}{{ m.name }}(self, {{ m.type.cy_type }} val):
 {% endmacro %}
 
 
-{#########################################################################
- # Render member
- #########################################################################}
-
-
 {% 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 #}
@@ -97,56 +63,3 @@ def set_{{ m.name }}(self, {{ m.type.cy_type }} val not None):
 {%   endif %}
 {% endif %}
 {% endmacro %}
-
-
-{#########################################################################
- # Render full class spec
- #########################################################################}
-
-{% macro render_spec(spec) -%}
-
-@cython.freelist(8)
-@cython.final
-cdef class {{ spec.name }}:
-    # Constructors
-    {{ render_constructors(spec) | indent }}
-
-{% if spec.has_destructor %}
-    # Destructor
-    def __dealloc__({{ spec.name }} self):
-        # /!\ if `__cinit__` is skipped, `_gd_data` must be initialized by
-        # hand otherwise we will get a segfault here
-        __{{ spec.name }}_destructor(&self._gd_data)
-{% else %}
-    # Destructor not needed
-{% endif %}
-
-    def __repr__(self):
-        # TODO: finish me...
-        # pythonscript_gdapi.variant_stringify(&self._gd_data)
-        return "<{{ spec.name }}>"
-{% if spec.name == "GDString" %}
-    def __str__(self):
-        self.to_pystr()
-{% endif %}
-{% if spec.constants %}
-    # Constants
-
-{% endif %}
-{% for c in spec.constants %}
-    {{ render_constant(spec, c) | indent }}
-{% endfor %}
-
-{% if spec.members %}
-    # Members
-
-{% endif %}
-{% for m in spec.members %}
-    {{ render_member(spec, m) | indent }}
-{% endfor %}
-
-{% if spec.methods %}
-    # Methods
-
-{% endif %}
-{%- endmacro %}

src/godot/builtins_pyx/class.pxi.j2 renamed to src/godot/builtins_pyx/member.pyx.j2

@@ -88,8 +88,9 @@ pyxbuiltins = custom_target(
         generate_tmpl_base_input,
         files(
             'builtins.pyx.j2',
-            'builtins_pyx/class.pxi.j2',
-            'builtins_pyx/constructor.pxi.j2',
+            'builtins_pyx/class.pyx.j2',
+            'builtins_pyx/constructor.pyx.j2',
+            'builtins_pyx/member.pyx.j2',
         ),
     ],
     command: generate_tmpl_cmd,