From dc7792d350cdcda5ed7c19559bcb83d9812b59e6 Mon Sep 17 00:00:00 2001 From: Duy-Nguyen Ta Date: Fri, 10 Mar 2017 23:27:29 -0500 Subject: [PATCH] unify/rename functions: matlab_code and cython_wrapper to generate_xxxxx_wrapper --- wrap/Module.cpp | 6 +++--- wrap/Module.h | 6 +++--- wrap/wrap.cpp | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/wrap/Module.cpp b/wrap/Module.cpp index c32202d14..9422ac726 100644 --- a/wrap/Module.cpp +++ b/wrap/Module.cpp @@ -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); @@ -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); string pxdFileName = toolboxPath + "/" + name + ".pxd"; 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); diff --git a/wrap/Module.h b/wrap/Module.h index fb99bd89a..05b7c9586 100644 --- a/wrap/Module.h +++ b/wrap/Module.h @@ -63,10 +63,10 @@ struct Module { void parseMarkup(const std::string& data); /// MATLAB code generation: - void matlab_code(const std::string& path) const; + void generate_matlab_wrapper(const std::string& path) const; /// 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_pyx(FileWriter& file) const; @@ -76,7 +76,7 @@ struct Module { const std::vector& functionNames) const; /// Python code generation: - void python_wrapper(const std::string& path) const; + void generate_python_wrapper(const std::string& path) const; private: static std::vector ExpandTypedefInstantiations( diff --git a/wrap/wrap.cpp b/wrap/wrap.cpp index a8147ed7e..7ac70a1bf 100644 --- a/wrap/wrap.cpp +++ b/wrap/wrap.cpp @@ -52,9 +52,9 @@ void generate_toolbox( if (language == "--matlab") // Then emit MATLAB code - module.matlab_code(toolboxPath); + module.generate_matlab_wrapper(toolboxPath); else if (language == "--cython") { - module.cython_wrapper(toolboxPath, cythonImports); + module.generate_cython_wrapper(toolboxPath, cythonImports); } else { cerr << "First argument invalid" << endl;