From 41b396df9a1874aaf48bbf983303051edaf62c14 Mon Sep 17 00:00:00 2001 From: ykiko Date: Fri, 4 Oct 2024 18:04:39 +0800 Subject: [PATCH 1/3] rename `module` to `module_`. --- include/pybind11/internal/module.h | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/include/pybind11/internal/module.h b/include/pybind11/internal/module.h index 0072de7f..de15de3c 100644 --- a/include/pybind11/internal/module.h +++ b/include/pybind11/internal/module.h @@ -4,38 +4,38 @@ namespace pkbind { -class module : public object { - PKBIND_TYPE_IMPL(object, module, tp_module) +class module_ : public object { + PKBIND_TYPE_IMPL(object, module_, tp_module) - static module __main__() { return module(py_getmodule("__main__"), object::ref_t{}); } + static module_ __main__() { return module_(py_getmodule("__main__"), object::ref_t{}); } - static module import(const char* name) { + static module_ import(const char* name) { raise_call(name); - return borrow(py_retval()); + return borrow(py_retval()); } - static module create(const char* name) { + static module_ create(const char* name) { auto m = py_newmodule(name); - return steal(m); + return steal(m); } - module def_submodule(const char* name, const char* doc = nullptr) { + module_ def_submodule(const char* name, const char* doc = nullptr) { // auto package = (attr("__package__").cast() += ".") += // attr("__name__").cast(); auto fname = (attr("__name__").cast() += ".") += name; auto m = py_newmodule(fname.c_str()); setattr(*this, name, m); - return module(m, object::ref_t{}); + return module_(m, object::ref_t{}); } template - module& def(const char* name, Fn&& fn, const Extras... extras) { + module_& def(const char* name, Fn&& fn, const Extras... extras) { impl::bind_function(*this, name, std::forward(fn), extras...); return *this; } }; -using module_ = module; +using module = module_; #define PYBIND11_EMBEDDED_MODULE(name, variable) \ static void _pkbind_register_##name(::pkbind::module& variable); \ From 53fa1933551399f6e43953e8e6886e8aae0a1b75 Mon Sep 17 00:00:00 2001 From: ykiko Date: Fri, 4 Oct 2024 18:09:06 +0800 Subject: [PATCH 2/3] update. --- include/pybind11/internal/module.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/include/pybind11/internal/module.h b/include/pybind11/internal/module.h index de15de3c..89751101 100644 --- a/include/pybind11/internal/module.h +++ b/include/pybind11/internal/module.h @@ -38,26 +38,26 @@ class module_ : public object { using module = module_; #define PYBIND11_EMBEDDED_MODULE(name, variable) \ - static void _pkbind_register_##name(::pkbind::module& variable); \ + static void _pkbind_register_##name(::pkbind::module_& variable); \ namespace pkbind::impl { \ auto _module_##name = [] { \ ::pkbind::action::register_start([] { \ - auto m = ::pkbind::module(py_newmodule(#name), ::pkbind::object::ref_t{}); \ + auto m = ::pkbind::module_(py_newmodule(#name), ::pkbind::object::ref_t{}); \ _pkbind_register_##name(m); \ }); \ return 1; \ }(); \ } \ - static void _pkbind_register_##name(::pkbind::module& variable) + static void _pkbind_register_##name(::pkbind::module_& variable) #define PYBIND11_MODULE(name, variable) \ - static void _pkbind_register_##name(::pkbind::module& variable); \ + static void _pkbind_register_##name(::pkbind::module_& variable); \ extern "C" PK_EXPORT bool py_module_initialize() { \ - auto m = ::pkbind::module::create(#name); \ + auto m = ::pkbind::module_::create(#name); \ _pkbind_register_##name(m); \ py_assign(py_retval(), m.ptr()); \ return true; \ } \ - static void _pkbind_register_##name(::pkbind::module& variable) + static void _pkbind_register_##name(::pkbind::module_& variable) } // namespace pkbind From 0f1abcb1f66cc65b63d55db386e691e9c9b9ae21 Mon Sep 17 00:00:00 2001 From: ykiko Date: Fri, 4 Oct 2024 18:11:24 +0800 Subject: [PATCH 3/3] make some clean. --- include/pybind11/internal/module.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/pybind11/internal/module.h b/include/pybind11/internal/module.h index 89751101..71a5d3b6 100644 --- a/include/pybind11/internal/module.h +++ b/include/pybind11/internal/module.h @@ -42,7 +42,7 @@ using module = module_; namespace pkbind::impl { \ auto _module_##name = [] { \ ::pkbind::action::register_start([] { \ - auto m = ::pkbind::module_(py_newmodule(#name), ::pkbind::object::ref_t{}); \ + auto m = ::pkbind::module_::create(#name); \ _pkbind_register_##name(m); \ }); \ return 1; \