Migrate to cxxheaderparser

robotpy · Oct 9, 2023 · 5dc4517 · 5dc4517
1 parent 906503d
commit 5dc4517
Show file tree

Hide file tree

Showing 38 changed files with 2,530 additions and 1,597 deletions.
diff --git a/robotpy_build/autowrap/cls_prologue.cpp.j2 b/robotpy_build/autowrap/cls_prologue.cpp.j2
@@ -19,7 +19,7 @@
 {% endif %}
 
 {% for decl in using_declarations %}
-using {{ decl }};
+using {{ decl.format() }};
 {% endfor %}
 
 {% for cls in classes_with_trampolines %}

diff --git a/robotpy_build/autowrap/cls_rpy_include.hpp.j2 b/robotpy_build/autowrap/cls_rpy_include.hpp.j2
@@ -5,12 +5,6 @@
     - Template constructors/method fillers (if applicable)
 
 #}
-{# TODO: remove when h2w is removed #}
-{% if 'class_ctx' not in cls %}{{ skip_generation() }}{% endif %}
-{% set cls = cls.class_ctx %}
-{% if not cls.trampoline and not cls.template %}
-    {{ skip_generation() }}
-{% endif %}
 
 // This file is autogenerated. DO NOT EDIT
 

diff --git a/robotpy_build/autowrap/cls_tmpl_impl.hpp.j2 b/robotpy_build/autowrap/cls_tmpl_impl.hpp.j2
@@ -10,7 +10,7 @@ using namespace {{ cls.namespace }};
 {% endif %}
 
 {% for decl in using_declarations %}
-using {{ decl }};
+using {{ decl.format() }};
 {% endfor %}
 
 template <{{ cls.template.parameter_list }}>

diff --git a/robotpy_build/autowrap/cls_tmpl_inst.cpp.j2 b/robotpy_build/autowrap/cls_tmpl_inst.cpp.j2
@@ -1,7 +1,5 @@
 {% include "cls_prologue.cpp.j2" %}
 
-{% set tmpl_data = template_instances[per_tmpl_vars.index] %}
-
 #include <rpygen/{{ tmpl_data.header_name }}>
 #include "{{ hname }}_tmpl.hpp"
 

diff --git a/robotpy_build/autowrap/cls_tmpl_inst.hpp.j2 b/robotpy_build/autowrap/cls_tmpl_inst.hpp.j2
@@ -4,7 +4,7 @@
 
 namespace rpygen {
 
-{% for tmpl_data in template_instances.values() %}
+{% for tmpl_data in template_instances %}
 struct {{ tmpl_data.binder_typename }} {
     {{ tmpl_data.binder_typename }}(py::module &m, const char * clsName);
     void finish(const char *set_doc, const char *add_doc);

diff --git a/robotpy_build/autowrap/cls_trampoline.hpp.j2 b/robotpy_build/autowrap/cls_trampoline.hpp.j2
@@ -51,7 +51,7 @@ using namespace {{ cls.namespace }};
 {% endif %}
 
 {% for decl in using_declarations %}
-using {{ decl }};
+using {{ decl.format() }};
 {% endfor %}
 
 {#
@@ -122,6 +122,9 @@ struct PyTrampoline_{{ cls.full_cpp_name_identifier }} : PyTrampolineBase, virtu
 {% for ccls in cls.child_classes if not ccls.template %}
   using {{ ccls.cpp_name }} [[maybe_unused]] = typename {{ ccls.full_cpp_name }};
 {% endfor %}
+{% for enum in cls.enums if enum.cpp_name %}
+  using {{ enum.cpp_name }} [[maybe_unused]] = typename {{ enum.full_cpp_name }};
+{% endfor %}
 {% for typealias in cls.user_typealias %}
     {{ typealias }};
 {% endfor %}

diff --git a/robotpy_build/autowrap/clsdeps.json.j2 b/robotpy_build/autowrap/clsdeps.json.j2