12345qiupeng
/
gtsam
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Moved wrapper class signature to Class.cpp

release/4.3a0
dellaert 2017-08-06 12:21:26 -07:00
parent 74a33ff222
commit 6068166d2b
3 changed files with 36 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
wrap/Class.cpp
View File

@ -764,6 +764,19 @@ void Class::emit_cython_pxd(FileWriter& pxdFile) const {
if (numMethods == 0) if (numMethods == 0)
pxdFile.oss << " pass\n"; pxdFile.oss << " pass\n";
} }
/* ************************************************************************* */
void Class::emit_cython_wrapper_pxd(FileWriter& pxdFile) const {
pxdFile.oss << "cdef class " << pyxClassName();
if (getParent())
pxdFile.oss << "(" << getParent()->pyxClassName() << ")";
pxdFile.oss << ":\n";
pxdFile.oss << " cdef " << shared_pxd_class_in_pyx() << " "
<< shared_pxd_obj_in_pyx() << "\n";
// cyCreateFromShared
pxdFile.oss << " @staticmethod\n";
pxdFile.oss << " cdef " << pyxClassName() << " cyCreateFromShared(const "
<< shared_pxd_class_in_pyx() << "& other)\n";
}
/* ************************************************************************* */ /* ************************************************************************* */
void Class::pyxInitParentObj(FileWriter& pyxFile, const std::string& pyObj, void Class::pyxInitParentObj(FileWriter& pyxFile, const std::string& pyObj,

1
wrap/Class.h
View File

@ -165,6 +165,7 @@ public:
// emit cython wrapper // emit cython wrapper
void emit_cython_pxd(FileWriter& pxdFile) const; void emit_cython_pxd(FileWriter& pxdFile) const;
void emit_cython_wrapper_pxd(FileWriter& pxdFile) const;
void emit_cython_pyx(FileWriter& pyxFile, void emit_cython_pyx(FileWriter& pyxFile,
const std::vector<Class>& allClasses) const; const std::vector<Class>& allClasses) const;
void pyxInitParentObj(FileWriter& pyxFile, const std::string& pyObj, void pyxInitParentObj(FileWriter& pyxFile, const std::string& pyObj,

44
wrap/Module.cpp
View File

@ -359,36 +359,26 @@ void Module::emit_cython_pxd(FileWriter& pxdFile) const {
for (const Class& cls : uninstantiatedClasses) { for (const Class& cls : uninstantiatedClasses) {
cls.emit_cython_pxd(pxdFile); cls.emit_cython_pxd(pxdFile);
for (const Class& expCls : expandedClasses) { for (const Class& expanded : expandedClasses) {
//... ctypedef for template instantiations bool matchingNonTemplated = !expanded.templateClass
if (expCls.templateClass && && expanded.pxdClassName() == cls.pxdClassName();
expCls.templateClass->pxdClassName() == cls.pxdClassName()) { bool isTemplatedFromCls = expanded.templateClass
pxdFile.oss << "ctypedef " << expCls.templateClass->pxdClassName() && expanded.templateClass->pxdClassName() == cls.pxdClassName();
// ctypedef for template instantiations
if (isTemplatedFromCls) {
pxdFile.oss << "\n";
pxdFile.oss << "ctypedef " << expanded.templateClass->pxdClassName()
<< "["; << "[";
for (size_t i = 0; i < expCls.templateInstTypeList.size(); ++i) for (size_t i = 0; i < expanded.templateInstTypeList.size(); ++i)
pxdFile.oss << expCls.templateInstTypeList[i].pxdClassName() pxdFile.oss << expanded.templateInstTypeList[i].pxdClassName()
<< ((i == expCls.templateInstTypeList.size() - 1) << ((i == expanded.templateInstTypeList.size() - 1) ? "" : ", ");
? "" pxdFile.oss << "] " << expanded.pxdClassName() << "\n";
: ", ");
pxdFile.oss << "] " << expCls.pxdClassName() << "\n";
} }
if ((!expCls.templateClass && // Python wrapper class
expCls.pxdClassName() == cls.pxdClassName()) || if (isTemplatedFromCls || matchingNonTemplated) {
(expCls.templateClass && expanded.emit_cython_wrapper_pxd(pxdFile);
expCls.templateClass->pxdClassName() == cls.pxdClassName())) {
pxdFile.oss << "\n";
pxdFile.oss << "cdef class " << expCls.pyxClassName();
if (expCls.getParent())
pxdFile.oss << "(" << expCls.getParent()->pyxClassName() << ")";
pxdFile.oss << ":\n";
pxdFile.oss << " cdef " << expCls.shared_pxd_class_in_pyx()
<< " " << expCls.shared_pxd_obj_in_pyx() << "\n";
// cyCreateFromShared
pxdFile.oss << " @staticmethod\n";
pxdFile.oss << " cdef " << expCls.pyxClassName()
<< " cyCreateFromShared(const "
<< expCls.shared_pxd_class_in_pyx() << "& other)\n";
} }
} }
pxdFile.oss << "\n\n"; pxdFile.oss << "\n\n";