Skip to content

fix to support templated callbacks #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

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

fix to support templated callbacks #135

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
22 changes: 14 additions & 8 deletions src/TemplateProxy.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,12 @@

namespace CPyCppyy {

static inline std::string targs2str(TemplateProxy* pytmpl)
{
if (!pytmpl || !pytmpl->fTemplateArgs) return "";
return CPyCppyy_PyText_AsString(pytmpl->fTemplateArgs);
}

//----------------------------------------------------------------------------
TemplateInfo::TemplateInfo() : fPyClass(nullptr), fNonTemplated(nullptr),
fTemplated(nullptr), fLowPriority(nullptr), fDoc(nullptr)
Expand Down Expand Up @@ -93,8 +99,14 @@ PyObject* TemplateProxy::Instantiate(const std::string& fname,
bool bArgSet = false;

// special case for arrays
PyObject* pytc = PyObject_GetAttr(itemi, PyStrings::gTypeCode);
if (pytc) {
if (TemplateProxy_CheckExact(itemi)) {
TemplateProxy *tn = (TemplateProxy*)itemi;
PyObject *f = PyUnicode_FromFormat("%s%s", tn->fTI->fCppName.c_str(), targs2str(tn).c_str());
PyTuple_SET_ITEM(tpArgs, i, f);
bArgSet = true;
}
PyObject* pytc;
if (!bArgSet && (pytc = PyObject_GetAttr(itemi, PyStrings::gTypeCode))) {
Py_buffer bufinfo;
memset(&bufinfo, 0, sizeof(Py_buffer));
std::string ptrdef;
Expand Down Expand Up @@ -420,12 +432,6 @@ static int tpp_doc_set(TemplateProxy* pytmpl, PyObject *val, void *)
std::for_each(errors.begin(), errors.end(), Utility::PyError_t::Clear);\
return result; }

static inline std::string targs2str(TemplateProxy* pytmpl)
{
if (!pytmpl || !pytmpl->fTemplateArgs) return "";
return CPyCppyy_PyText_AsString(pytmpl->fTemplateArgs);
}

static inline void UpdateDispatchMap(TemplateProxy* pytmpl, bool use_targs, uint64_t sighash, CPPOverload* pymeth)
{
// Memoize a method in the dispatch map after successful call; replace old if need be (may be
Expand Down
Loading