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

unify/rename functions: matlab_code and cython_wrapper to generate_xxxxx_wrapper

release/4.3a0
Duy-Nguyen Ta 2017-03-10 23:27:29 -05:00
parent b7efaf8c3f
commit dc7792d350
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
wrap/Module.cpp
View File

@ -259,7 +259,7 @@ void Module::parseMarkup(const std::string& data) {
} }
/* ************************************************************************* */ /* ************************************************************************* */
void Module::matlab_code(const string& toolboxPath) const { void Module::generate_matlab_wrapper(const string& toolboxPath) const {
fs::create_directories(toolboxPath); fs::create_directories(toolboxPath);
@ -320,7 +320,7 @@ void Module::matlab_code(const string& toolboxPath) const {
} }
/* ************************************************************************* */ /* ************************************************************************* */
void Module::cython_wrapper(const string& toolboxPath, const std::string& pxdImports) const { void Module::generate_cython_wrapper(const string& toolboxPath, const std::string& pxdImports) const {
fs::create_directories(toolboxPath); fs::create_directories(toolboxPath);
string pxdFileName = toolboxPath + "/" + name + ".pxd"; string pxdFileName = toolboxPath + "/" + name + ".pxd";
FileWriter pxdFile(pxdFileName, verbose, "#"); FileWriter pxdFile(pxdFileName, verbose, "#");
@ -613,7 +613,7 @@ void Module::WriteRTTIRegistry(FileWriter& wrapperFile, const std::string& modul
} }
/* ************************************************************************* */ /* ************************************************************************* */
void Module::python_wrapper(const string& toolboxPath) const { void Module::generate_python_wrapper(const string& toolboxPath) const {
fs::create_directories(toolboxPath); fs::create_directories(toolboxPath);

6
wrap/Module.h
View File

@ -63,10 +63,10 @@ struct Module {
void parseMarkup(const std::string& data); void parseMarkup(const std::string& data);
/// MATLAB code generation: /// MATLAB code generation:
void matlab_code(const std::string& path) const; void generate_matlab_wrapper(const std::string& path) const;
/// Cython code generation: /// Cython code generation:
void cython_wrapper(const std::string& path, const std::string& pxdImports) const; void generate_cython_wrapper(const std::string& path, const std::string& pxdImports) const;
void emit_cython_pxd(FileWriter& file) const; void emit_cython_pxd(FileWriter& file) const;
void emit_cython_pyx(FileWriter& file) const; void emit_cython_pyx(FileWriter& file) const;
@ -76,7 +76,7 @@ struct Module {
const std::vector<std::string>& functionNames) const; const std::vector<std::string>& functionNames) const;
/// Python code generation: /// Python code generation:
void python_wrapper(const std::string& path) const; void generate_python_wrapper(const std::string& path) const;
private: private:
static std::vector<Class> ExpandTypedefInstantiations( static std::vector<Class> ExpandTypedefInstantiations(

4
wrap/wrap.cpp
View File

@ -52,9 +52,9 @@ void generate_toolbox(
if (language == "--matlab") if (language == "--matlab")
// Then emit MATLAB code // Then emit MATLAB code
module.matlab_code(toolboxPath); module.generate_matlab_wrapper(toolboxPath);
else if (language == "--cython") { else if (language == "--cython") {
module.cython_wrapper(toolboxPath, cythonImports); module.generate_cython_wrapper(toolboxPath, cythonImports);
} }
else { else {
cerr << "First argument invalid" << endl; cerr << "First argument invalid" << endl;