Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update context.cpp to avoid else after return #292

Merged
merged 3 commits into from
Apr 11, 2024
Merged

Update context.cpp to avoid else after return #292

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f5d4225
Update context.cpp to avoid else after return
andriish Apr 4, 2024
b4a2962
LLVM 18 compatibility
Apr 6, 2024
a4127e0
Merge remote-tracking branch 'origin/pure' into patch-7
Apr 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions source/class.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -616,7 +616,11 @@ bool is_callback_structure_needed(CXXRecordDecl const *C)
// check if all pure-virtual methods could be overridden in Python
if( C->isAbstract() ) {
for( auto m = C->method_begin(); m != C->method_end(); ++m ) {
#if( LLVM_VERSION_MAJOR >= 18 )
if( m->isPureVirtual() and is_const_overload(*m) ) return false; // it is not clear how to deal with this case since we can't overrdie const versions in Python, - so disabling for now
#else
if( m->isPure() and is_const_overload(*m) ) return false; // it is not clear how to deal with this case since we can't overrdie const versions in Python, - so disabling for now
#endif
}
}

Expand Down Expand Up @@ -644,7 +648,11 @@ bool is_callback_structure_constructible(CXXRecordDecl const *C)
{
if( C->isAbstract() ) {
for( auto m = C->method_begin(); m != C->method_end(); ++m ) {
#if( LLVM_VERSION_MAJOR >= 18 )
if( m->isPureVirtual() and !isa<CXXConstructorDecl>(*m) and (m->getAccess() == AS_private or !is_bindable(*m) or is_skipping_requested(*m, Config::get())) ) return false;
#else
if( m->isPure() and !isa<CXXConstructorDecl>(*m) and (m->getAccess() == AS_private or !is_bindable(*m) or is_skipping_requested(*m, Config::get())) ) return false;
#endif
}

for( auto b = C->bases_begin(); b != C->bases_end(); ++b ) {
Expand Down Expand Up @@ -766,7 +774,11 @@ string bind_member_functions_for_call_back(CXXRecordDecl const *C, string const
string custom_function_info = Config::get().is_custom_trampoline_function_requested(member_function_name);
if( custom_function_info == "" ) {
c += indent(fmt::format(call_back_function_body_template, class_name, /*class_qualified_name(C), */ python_name, std::get<1>(args), return_type), "\t\t");
#if( LLVM_VERSION_MAJOR >= 18 )
if( m->isPureVirtual() ) c += "\t\tpybind11::pybind11_fail(\"Tried to call pure virtual function \\\"{}::{}\\\"\");\n"_format(C->getNameAsString(), python_name);
#else
if( m->isPure() ) c += "\t\tpybind11::pybind11_fail(\"Tried to call pure virtual function \\\"{}::{}\\\"\");\n"_format(C->getNameAsString(), python_name);
#endif
else c += "\t\treturn {}::{}({});\n"_format(C->getNameAsString(), m->getNameAsString(), std::get<1>(args));
}
else {
Expand Down
2 changes: 1 addition & 1 deletion source/context.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ PYBIND11_MODULE({2}, root_module) {{
auto mangle_namespace_name(
[](std::string const &ns) -> std::string {{
if ( std::find(reserved_python_words.begin(), reserved_python_words.end(), ns) == reserved_python_words.end() ) return ns;
else return ns+'_';
return ns+'_';
}}
);
Expand Down
Loading