Test programs build, most tests pass, incremental build works

- pyi generation is broken, need to think about it

Author: virtuald

examples/demo/pyproject.toml

@@ -35,4 +35,4 @@ version = "0.0.1"
 name = "demo"
 
 [tool.semiwrap.extension_modules."swdemo._demo".headers]
-demo = "swdemo/include/demo.h"
+demo = "include/demo.h"

examples/demo/wrapcfg/trampolines/.gitignore

@@ -0,0 +1 @@
+/meson.build

src/semiwrap/autowrap/render_cls_prologue.py

@@ -38,4 +38,4 @@ def render_class_prologue(r: RenderBuffer, hctx: HeaderContext):
         r.writeln(
             f"#define RPYGEN_ENABLE_{cls.full_cpp_name_identifier}_PROTECTED_CONSTRUCTORS"
         )
-        r.writeln(f"#include <rpygen/{cls.full_cpp_name_identifier}.hpp>")
+        r.writeln(f"#include <trampolines/{cls.full_cpp_name_identifier}.hpp>")

src/semiwrap/autowrap/render_cls_rpy_include.py

@@ -40,14 +40,15 @@ def render_cls_rpy_include_hpp(ctx: HeaderContext, cls: ClassContext) -> str:
     )
 
     if ctx.extra_includes_first:
-        r.writeln()
+        r.writeln("\n// from extra_includes_first")
         for inc in ctx.extra_includes_first:
             r.writeln(f"#include <{inc}>")
 
-    r.writeln(f"\n#include <{ctx.rel_fname}>")
+    r.writeln("\n// wrapped header")
+    r.writeln(f"#include <{ctx.rel_fname}>")
 
     if ctx.extra_includes:
-        r.writeln()
+        r.writeln("\n// from extra_includes")
         for inc in ctx.extra_includes:
             r.writeln(f"#include <{inc}>")
 
@@ -104,7 +105,7 @@ def _render_cls_trampoline(
     if cls.bases:
         r.writeln()
         for base in cls.bases:
-            r.writeln(f"#include <rpygen/{ base.full_cpp_name_identifier }.hpp>")
+            r.writeln(f"#include <trampolines/{ base.full_cpp_name_identifier }.hpp>")
 
     if cls.namespace:
         r.writeln(f"\nnamespace {cls.namespace.strip('::')} {{")

src/semiwrap/autowrap/render_tmpl_inst.py

@@ -14,7 +14,7 @@ def render_template_inst_cpp(
 
     r.write_trim(
         f"""
-        #include <rpygen/{ tmpl_data.header_name }>
+        #include <trampolines/{ tmpl_data.header_name }>
         #include "{ hctx.hname }_tmpl.hpp"
 
         namespace rpygen {{

src/semiwrap/casters.py

@@ -4,7 +4,6 @@
 import typing as T
 
 from .config.util import parse_input
-from .util import maybe_write_file
 
 PKGCONF_CASTER_EXT = ".pybind11.json"
 
@@ -28,7 +27,8 @@ def load_typecaster_data(fname) -> TypeCasterData:
 
 
 def save_typecaster_data(fname: pathlib.Path, data: TypeCasterData):
-    maybe_write_file(fname, json.dumps(dataclasses.asdict(data)))
+    with open(fname, "w") as fp:
+        json.dump(dataclasses.asdict(data), fp)
 
 
 #: content of pickle file

src/semiwrap/cmd_dat2cpp.py

@@ -9,7 +9,6 @@
 
 from .autowrap.context import HeaderContext
 from .autowrap.render_wrapped import render_wrapped_cpp
-from .util import maybe_write_file
 
 
 def _write_wrapper_cpp(input_dat: pathlib.Path, output_cpp: pathlib.Path):
@@ -19,8 +18,7 @@ def _write_wrapper_cpp(input_dat: pathlib.Path, output_cpp: pathlib.Path):
     assert isinstance(hctx, HeaderContext)
 
     content = render_wrapped_cpp(hctx)
-    maybe_write_file(output_cpp, content)
-
+    output_cpp.write_text(content)
 
 def main():
     try:

src/semiwrap/cmd_dat2tmplcpp.py

@@ -9,7 +9,6 @@
 
 from .autowrap.context import HeaderContext
 from .autowrap.render_tmpl_inst import render_template_inst_cpp
-from .util import maybe_write_file
 
 
 def _write_wrapper_cpp(
@@ -27,7 +26,7 @@ def _write_wrapper_cpp(
         raise ValueError(f"internal error: cannot find {py_name}")
 
     content = render_template_inst_cpp(hctx, tmpl)
-    maybe_write_file(output_cpp, content)
+    output_cpp.write_text(content)
 
 
 def main():

src/semiwrap/cmd_dat2tmplhpp.py

@@ -7,7 +7,6 @@
 
 from .autowrap.context import HeaderContext
 from .autowrap.render_tmpl_inst import render_template_inst_hpp
-from .util import maybe_write_file
 
 
 def _write_tmpl_hpp(input_dat: pathlib.Path, output_hpp: pathlib.Path):
@@ -17,7 +16,7 @@ def _write_tmpl_hpp(input_dat: pathlib.Path, output_hpp: pathlib.Path):
     assert isinstance(hctx, HeaderContext)
 
     content = render_template_inst_hpp(hctx)
-    maybe_write_file(output_hpp, content)
+    output_hpp.write_text(content)
 
 
 def main():

src/semiwrap/cmd_dat2trampoline.py

@@ -9,7 +9,6 @@
 
 from .autowrap.context import HeaderContext, ClassContext
 from .autowrap.render_cls_rpy_include import render_cls_rpy_include_hpp
-from .util import maybe_write_file
 
 
 def _get_classes(hctx: HeaderContext):
@@ -41,7 +40,7 @@ def _write_wrapper_cpp(
         raise ValueError(f"internal error: cannot find {yml_id} (found {avail})")
 
     content = render_cls_rpy_include_hpp(hctx, cls)
-    maybe_write_file(output_hpp, content)
+    output_hpp.write_text(content)
 
 
 def main():