Skip to content

Implement Arg match functions used by numba extension #134

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Implement Arg match functions used by numba extension #134

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
75 changes: 50 additions & 25 deletions clingwrapper/src/clingwrapper.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1367,33 +1367,58 @@ std::string Cppyy::GetMethodArgDefault(TCppMethod_t method, TCppIndex_t iarg)
return Cpp::GetFunctionArgDefault(method, iarg);
}

static inline Cppyy::TCppIndex_t ArgSimilarityScore(Cppyy::TCppType_t argqtp,
Cppyy::TCppType_t reqqtp) {
// This scoring is not based on any particular rules
if (Cpp::IsSameType(argqtp, reqqtp))
return 0; // Best match
else if ((Cpp::IsSignedIntegerType(argqtp) &&
Cpp::IsSignedIntegerType(reqqtp)) ||
(Cpp::IsUnsignedIntegerType(argqtp) &&
Cpp::IsUnsignedIntegerType(reqqtp)) ||
(Cpp::IsFloatingType(argqtp) && Cpp::IsFloatingType(reqqtp)))
return 1;
else if ((Cpp::IsSignedIntegerType(argqtp) &&
Cpp::IsUnsignedIntegerType(reqqtp)) ||
(Cpp::IsFloatingType(argqtp) && Cpp::IsUnsignedIntegerType(reqqtp)))
return 2;
else if ((Cpp::IsIntegerType(argqtp) && Cpp::IsIntegerType(reqqtp)))
return 3;
else if ((Cpp::IsIntegralType(argqtp) && Cpp::IsIntegralType(reqqtp)))
return 4;
else if ((Cpp::IsVoidPointerType(argqtp) && Cpp::IsPointerType(reqqtp)))
return 5;
else
return 10; // Penalize heavily for no possible match
}

Cppyy::TCppIndex_t Cppyy::CompareMethodArgType(TCppMethod_t method, TCppIndex_t iarg, const std::string &req_type)
{
// if (method) {
// TFunction* f = m2f(method);
// TMethodArg* arg = (TMethodArg *)f->GetListOfMethodArgs()->At((int)iarg);
// void *argqtp = gInterpreter->TypeInfo_QualTypePtr(arg->GetTypeInfo());

// TypeInfo_t *reqti = gInterpreter->TypeInfo_Factory(req_type.c_str());
// void *reqqtp = gInterpreter->TypeInfo_QualTypePtr(reqti);

// if (ArgSimilarityScore(argqtp, reqqtp) < 10) {
// return ArgSimilarityScore(argqtp, reqqtp);
// }
// else { // Match using underlying types
// if(gInterpreter->IsPointerType(argqtp))
// argqtp = gInterpreter->TypeInfo_QualTypePtr(gInterpreter->GetPointerType(argqtp));

// // Handles reference types and strips qualifiers
// TypeInfo_t *arg_ul = gInterpreter->GetNonReferenceType(argqtp);
// TypeInfo_t *req_ul = gInterpreter->GetNonReferenceType(reqqtp);
// argqtp = gInterpreter->TypeInfo_QualTypePtr(gInterpreter->GetUnqualifiedType(gInterpreter->TypeInfo_QualTypePtr(arg_ul)));
// reqqtp = gInterpreter->TypeInfo_QualTypePtr(gInterpreter->GetUnqualifiedType(gInterpreter->TypeInfo_QualTypePtr(req_ul)));

// return ArgSimilarityScore(argqtp, reqqtp);
// }
// }
return 0; // Method is not valid
if (method) {
Cppyy::TCppType_t type_a = GetMethodArgType(method, iarg);
Cppyy::TCppType_t type_b = GetType(req_type);

if (ArgSimilarityScore(type_a, type_b) < 10) {
return ArgSimilarityScore(type_a, type_b);
} else { // Match using underlying types
if (Cpp::IsPointerType(type_a))
type_a = Cpp::GetPointeeType(type_a);

if (ArgSimilarityScore(type_a, type_b) > 10) {
// Handles reference types and strips qualifiers
type_a = Cpp::GetNonReferenceType(type_a);
type_b = Cpp::GetNonReferenceType(type_b);
if (ArgSimilarityScore(type_a, type_b) > 10) {
type_a = Cpp::GetUnqualifiedType(type_a);
type_b = Cpp::GetUnqualifiedType(type_b);
return (bool)ArgSimilarityScore(type_a, type_b) < 10;
}
return ArgSimilarityScore(type_a, type_b);
}
return ArgSimilarityScore(type_a, type_b);
}
}
return 100; // Method is not valid
}

std::string Cppyy::GetMethodSignature(TCppMethod_t method, bool show_formal_args, TCppIndex_t max_args)
Expand Down
Loading