Merge pull request #12 from martinRenou/rename_files

Rename classes and files

CMakeLists.txt

@@ -87,9 +87,9 @@ set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib; ${CMAKE_INSTALL_PREFIX}/${
 
 set(XEUSCLING_SRC
     src/main.cpp
-    src/xpython_interpreter.cpp
-    src/xpython_logger.cpp
-    src/xpython_display.cpp
+    src/xinterpreter.cpp
+    src/xlogger.cpp
+    src/xdisplay.cpp
     src/xpyt_config.hpp
 )
 

src/main.cpp

@@ -14,7 +14,7 @@
 #include "xeus/xkernel.hpp"
 #include "xeus/xkernel_configuration.hpp"
 
-#include "xpython_interpreter.hpp"
+#include "xinterpreter.hpp"
 
 #include "Python.h"
 
@@ -40,12 +40,12 @@ std::string extract_filename(int& argc, char* argv[])
 
 int main(int argc, char* argv[])
 {
-    using interpreter_ptr = std::unique_ptr<xpyt::xpython_interpreter>;
+    using interpreter_ptr = std::unique_ptr<xpyt::interpreter>;
 
     std::string file_name = (argc == 1) ? "connection.json" : extract_filename(argc, argv);
     xeus::xconfiguration config = xeus::load_configuration(file_name);
 
-    interpreter_ptr interpreter = interpreter_ptr(new xpyt::xpython_interpreter(argc, argv));
+    interpreter_ptr interpreter = interpreter_ptr(new xpyt::interpreter(argc, argv));
     xeus::xkernel kernel(config, xeus::get_user_name(), std::move(interpreter));
     std::cout << "starting xeus-python kernel" << std::endl;
     kernel.start();

src/xpython_display.cpp → src/xdisplay.cpp

@@ -10,7 +10,7 @@
 #include "pybind11/pybind11.h"
 #include "pybind11/embed.h"
 
-#include "xpython_display.hpp"
+#include "xdisplay.hpp"
 
 namespace py = pybind11;
 

src/xpython_display.hpp → src/xdisplay.hpp

@@ -7,8 +7,8 @@
 * The full license is in the file LICENSE, distributed with this software. *
 ****************************************************************************/
 
-#ifndef XPYT_PYTHON_DISPLAY_HPP
-#define XPYT_PYTHON_DISPLAY_HPP
+#ifndef XPYT_DISPLAY_HPP
+#define XPYT_DISPLAY_HPP
 
 #include <functional>
 

src/xpython_interpreter.cpp → src/xinterpreter.cpp

@@ -17,28 +17,28 @@
 #include "pybind11/functional.h"
 
 #include "xpyt_config.hpp"
-#include "xpython_interpreter.hpp"
-#include "xpython_logger.hpp"
+#include "xinterpreter.hpp"
+#include "xlogger.hpp"
 
 namespace py = pybind11;
 
 namespace xpyt
 {
-    void xpython_interpreter::configure_impl()
+    void interpreter::configure_impl()
     {
     }
 
-    xpython_interpreter::xpython_interpreter(int /*argc*/, const char* const* /*argv*/)
+    interpreter::interpreter(int /*argc*/, const char* const* /*argv*/)
     {
         py::initialize_interpreter();
 
         redirect_output();
         redirect_display();
     }
 
-    xpython_interpreter::~xpython_interpreter() {}
+    interpreter::~interpreter() {}
 
-    xeus::xjson xpython_interpreter::execute_request_impl(
+    xeus::xjson interpreter::execute_request_impl(
         int execution_counter,
         const std::string& code,
         bool silent,
@@ -108,31 +108,31 @@ namespace xpyt
         return kernel_res;
     }
 
-    xeus::xjson xpython_interpreter::complete_request_impl(
+    xeus::xjson interpreter::complete_request_impl(
         const std::string& code,
         int cursor_pos)
     {
         return xeus::xjson::object();
     }
 
-    xeus::xjson xpython_interpreter::inspect_request_impl(const std::string& /*code*/,
+    xeus::xjson interpreter::inspect_request_impl(const std::string& /*code*/,
                                                   int /*cursor_pos*/,
                                                   int /*detail_level*/)
     {
         return xeus::xjson::object();
     }
 
-    xeus::xjson xpython_interpreter::history_request_impl(const xeus::xhistory_arguments& /*args*/)
+    xeus::xjson interpreter::history_request_impl(const xeus::xhistory_arguments& /*args*/)
     {
         return xeus::xjson::object();
     }
 
-    xeus::xjson xpython_interpreter::is_complete_request_impl(const std::string& /*code*/)
+    xeus::xjson interpreter::is_complete_request_impl(const std::string& /*code*/)
     {
         return xeus::xjson::object();
     }
 
-    xeus::xjson xpython_interpreter::kernel_info_request_impl()
+    xeus::xjson interpreter::kernel_info_request_impl()
     {
         xeus::xjson result;
         result["implementation"] = "xeus-python";
@@ -165,16 +165,16 @@ namespace xpyt
         return result;
     }
 
-    void xpython_interpreter::shutdown_request_impl()
+    void interpreter::shutdown_request_impl()
     {
         py::finalize_interpreter();
     }
 
-    void xpython_interpreter::input_reply_impl(const std::string& /*value*/)
+    void interpreter::input_reply_impl(const std::string& /*value*/)
     {
     }
 
-    void xpython_interpreter::redirect_output()
+    void interpreter::redirect_output()
     {
         // In Python:
         // import sys and import xeus_python_logger
@@ -202,7 +202,7 @@ namespace xpyt
         sys.attr("stderr") = err_logger;
     }
 
-    void xpython_interpreter::redirect_display()
+    void interpreter::redirect_display()
     {
         py::module sys = py::module::import("sys");
 

src/xpython_interpreter.hpp → src/xinterpreter.hpp

@@ -7,8 +7,8 @@
 * The full license is in the file LICENSE, distributed with this software. *
 ****************************************************************************/
 
-#ifndef XPYT_PYTHON_INTERPRETER_HPP
-#define XPYT_PYTHON_INTERPRETER_HPP
+#ifndef XPYT_INTERPRETER_HPP
+#define XPYT_INTERPRETER_HPP
 
 #include <string>
 
@@ -21,12 +21,12 @@ namespace py = pybind11;
 
 namespace xpyt
 {
-    class xpython_interpreter : public xeus::xinterpreter
+    class interpreter : public xeus::xinterpreter
     {
     public:
 
-        xpython_interpreter(int argc, const char* const* argv);
-        virtual ~xpython_interpreter();
+        interpreter(int argc, const char* const* argv);
+        virtual ~interpreter();
 
     private:
 

src/xpython_logger.cpp → src/xlogger.cpp

@@ -13,26 +13,26 @@
 #include "pybind11/embed.h"
 #include "pybind11/functional.h"
 
-#include "xpython_logger.hpp"
+#include "xlogger.hpp"
 
 namespace py = pybind11;
 
 namespace xpyt
 {
-    xpython_logger::xpython_logger()
+    xlogger::xlogger()
     {
     }
 
-    xpython_logger::~xpython_logger()
+    xlogger::~xlogger()
     {
     }
 
-    void xpython_logger::add_logger(logger_function_type logger)
+    void xlogger::add_logger(logger_function_type logger)
     {
         m_loggers.push_back(logger);
     }
 
-    void xpython_logger::write(const std::string& message)
+    void xlogger::write(const std::string& message)
     {
         for (auto it = m_loggers.begin(); it != m_loggers.end(); ++it)
         {
@@ -41,9 +41,9 @@ namespace xpyt
     }
 
     PYBIND11_EMBEDDED_MODULE(xeus_python_logger, m) {
-        py::class_<xpython_logger>(m, "XPythonLogger")
+        py::class_<xlogger>(m, "XPythonLogger")
             .def(py::init<>())
-            .def("add_logger", &xpython_logger::add_logger)
-            .def("write", &xpython_logger::write);
+            .def("add_logger", &xlogger::add_logger)
+            .def("write", &xlogger::write);
     }
 }

src/xpython_logger.hpp → src/xlogger.hpp

@@ -7,25 +7,25 @@
 * The full license is in the file LICENSE, distributed with this software. *
 ****************************************************************************/
 
-#ifndef XPYT_PYTHON_LOGGER_HPP
-#define XPYT_PYTHON_LOGGER_HPP
+#ifndef XPYT_LOGGER_HPP
+#define XPYT_LOGGER_HPP
 
 #include <string>
 #include <vector>
 #include <functional>
 
 namespace xpyt
 {
-    class xpython_logger
+    class xlogger
     {
 
     public:
 
         using logger_function_type = std::function<void(const std::string&)>;
         using loggers_type = std::vector<logger_function_type>;
 
-        xpython_logger();
-        virtual ~xpython_logger();
+        xlogger();
+        virtual ~xlogger();
 
         void add_logger(logger_function_type logger);
         void write(const std::string& message);