Skip to content

Improve GetMethodTemplate and implement Cppyy::ResolveName #135

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

Merged
merged 2 commits into from
Mar 31, 2025
Merged

Improve GetMethodTemplate and implement Cppyy::ResolveName #135

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
075b328
Improve handling of `GetMethodTemplate` to fall back on `Instantiate`
aaronj0 Mar 21, 2025
b422a61
Implement `Cppyy::ResolveName`
aaronj0 Mar 21, 2025
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
45 changes: 14 additions & 31 deletions clingwrapper/src/clingwrapper.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,13 +362,15 @@ std::string Cppyy::ToString(TCppType_t klass, TCppObject_t obj)
}

// // name to opaque C++ scope representation -----------------------------------
std::string Cppyy::ResolveName(const std::string& cppitem_name)
{
#ifdef PRINT_DEBUG
printf("Resolve name input = %s\n", cppitem_name.c_str());
#endif
return cppitem_name;

std::string Cppyy::ResolveName(const std::string& name) {
if (!name.empty()) {
if (Cppyy::TCppType_t type =
Cppyy::GetType(name, /*enable_slow_lookup=*/true))
return Cppyy::GetTypeAsString(Cppyy::ResolveType(type));
return name;
}
return "";
}
// // Fully resolve the given name to the final type name.
//
// // try memoized type cache, in case seen before
Expand Down Expand Up @@ -443,7 +445,7 @@ std::string Cppyy::ResolveName(const std::string& cppitem_name)
// if (tclean.compare(0, 6, "const ") != 0)
// return TClassEdit::ShortType(tclean.c_str(), 2);
// return "const " + TClassEdit::ShortType(tclean.c_str(), 2);
}
// }


Cppyy::TCppType_t Cppyy::ResolveType(TCppType_t type) {
Expand Down Expand Up @@ -1461,23 +1463,6 @@ bool Cppyy::IsTemplatedMethod(TCppMethod_t method)
return Cpp::IsTemplatedFunction(method);
}

// // helpers for Cppyy::GetMethodTemplate()
// static std::map<TDictionary::DeclId_t, CallWrapper*> gMethodTemplates;
//
// static inline
// void remove_space(std::string& n) {
// std::string::iterator pos = std::remove_if(n.begin(), n.end(), isspace);
// n.erase(pos, n.end());
// }
//
// static inline
// bool template_compare(std::string n1, std::string n2) {
// if (n1.back() == '>') n1 = n1.substr(0, n1.size()-1);
// remove_space(n1);
// remove_space(n2);
// return n2.compare(0, n1.size(), n1) == 0;
// }
//
Cppyy::TCppMethod_t Cppyy::GetMethodTemplate(
TCppScope_t scope, const std::string& name, const std::string& proto)
{
Expand Down Expand Up @@ -1508,17 +1493,15 @@ Cppyy::TCppMethod_t Cppyy::GetMethodTemplate(
Cppyy::AppendTypesSlow(proto, arg_types);
Cppyy::AppendTypesSlow(explicit_params, templ_params);

Cppyy::TCppMethod_t cppmeth = nullptr;
Cppyy::TCppMethod_t cppmeth = Cpp::BestOverloadFunctionMatch(
unresolved_candidate_methods, templ_params, arg_types);

if (unresolved_candidate_methods.size() == 1 && !templ_params.empty())
if (!cppmeth && unresolved_candidate_methods.size() == 1 &&
!templ_params.empty())
cppmeth =
Cpp::InstantiateTemplate(unresolved_candidate_methods[0],
templ_params.data(), templ_params.size());

if (!cppmeth)
cppmeth = Cpp::BestOverloadFunctionMatch(unresolved_candidate_methods,
templ_params, arg_types);

return cppmeth;

// if it fails, use Sema to propogate info about why it failed (DeductionInfo)
Expand Down