Merge pull request #399 from JohanMabille/json

Wraps nlohmann_json include
jupyter-xeus · May 7, 2024 · 1bbef72 · 1bbef72
2 parents fd65b9e + 5a5f265
commit 1bbef72
Show file tree

Hide file tree

Showing 22 changed files with 69 additions and 53 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -106,6 +106,7 @@ set(XEUS_HEADERS
     ${XEUS_INCLUDE_DIR}/xeus/xhistory_manager.hpp
     ${XEUS_INCLUDE_DIR}/xeus/xinput.hpp
     ${XEUS_INCLUDE_DIR}/xeus/xinterpreter.hpp
+    ${XEUS_INCLUDE_DIR}/xeus/xjson.hpp
     ${XEUS_INCLUDE_DIR}/xeus/xkernel.hpp
     ${XEUS_INCLUDE_DIR}/xeus/xkernel_configuration.hpp
     ${XEUS_INCLUDE_DIR}/xeus/xlogger.hpp

diff --git a/include/xeus/xcomm.hpp b/include/xeus/xcomm.hpp
@@ -16,10 +16,9 @@
 #include <string>
 #include <utility>
 
-#include "nlohmann/json.hpp"
-
-#include "xguid.hpp"
-#include "xmessage.hpp"
+#include "xeus/xguid.hpp"
+#include "xeus/xjson.hpp"
+#include "xeus/xmessage.hpp"
 
 namespace nl = nlohmann;
 

diff --git a/include/xeus/xcontrol_messenger.hpp b/include/xeus/xcontrol_messenger.hpp
@@ -10,9 +10,8 @@
 #ifndef XEUS_CONTROL_MESSENGER_HPP
 #define XEUS_CONTROL_MESSENGER_HPP
 
-#include "nlohmann/json.hpp"
-
 #include "xeus/xeus.hpp"
+#include "xeus/xjson.hpp"
 
 namespace nl = nlohmann;
 

diff --git a/include/xeus/xdebugger.hpp b/include/xeus/xdebugger.hpp
@@ -10,12 +10,11 @@
 #ifndef XEUS_DEBUGGER_HPP
 #define XEUS_DEBUGGER_HPP
 
-#include "nlohmann/json.hpp"
-
-#include "xeus.hpp"
-#include "xeus_context.hpp"
-#include "xkernel_configuration.hpp"
-#include "xcontrol_messenger.hpp"
+#include "xeus/xeus.hpp"
+#include "xeus/xeus_context.hpp"
+#include "xeus/xjson.hpp"
+#include "xeus/xkernel_configuration.hpp"
+#include "xeus/xcontrol_messenger.hpp"
 
 namespace nl = nlohmann;
 

diff --git a/include/xeus/xeus_context.hpp b/include/xeus/xeus_context.hpp
@@ -12,7 +12,7 @@
 
 #include <memory>
 
-#include "xeus.hpp"
+#include "xeus/xeus.hpp"
 
 namespace xeus
 {

diff --git a/include/xeus/xguid.hpp b/include/xeus/xguid.hpp
@@ -12,7 +12,7 @@
 
 #include "xtl/xbasic_fixed_string.hpp"
 
-#include "xeus.hpp"
+#include "xeus/xeus.hpp"
 
 namespace xeus
 {

diff --git a/include/xeus/xhelper.hpp b/include/xeus/xhelper.hpp
@@ -15,10 +15,9 @@
 #include <vector>
 
 #include "xeus/xeus.hpp"
+#include "xeus/xjson.hpp"
 #include "xeus/xkernel_configuration.hpp"
 
-#include "nlohmann/json.hpp"
-
 namespace nl = nlohmann;
 
 namespace xeus

diff --git a/include/xeus/xhistory_manager.hpp b/include/xeus/xhistory_manager.hpp
@@ -13,9 +13,8 @@
 #include <string>
 #include <vector>
 
-#include "nlohmann/json.hpp"
-
-#include "xeus.hpp"
+#include "xeus/xeus.hpp"
+#include "xeus/xjson.hpp"
 
 namespace nl = nlohmann;
 

diff --git a/include/xeus/xinterpreter.hpp b/include/xeus/xinterpreter.hpp
@@ -14,11 +14,11 @@
 #include <string>
 #include <vector>
 
-#include "xcomm.hpp"
-#include "xeus.hpp"
-#include "xcontrol_messenger.hpp"
-#include "xhistory_manager.hpp"
-#include "xrequest_context.hpp"
+#include "xeus/xcomm.hpp"
+#include "xeus/xeus.hpp"
+#include "xeus/xcontrol_messenger.hpp"
+#include "xeus/xhistory_manager.hpp"
+#include "xeus/xrequest_context.hpp"
 
 namespace xeus
 {

diff --git a/include/xeus/xjson.hpp b/include/xeus/xjson.hpp
@@ -0,0 +1,25 @@
+/***************************************************************************
+* Copyright (c) 2016, Johan Mabille, Sylvain Corlay, Martin Renou          *
+* Copyright (c) 2016, QuantStack                                           *
+*                                                                          *
+* Distributed under the terms of the BSD 3-Clause License.                 *
+*                                                                          *
+* The full license is in the file LICENSE, distributed with this software. *
+****************************************************************************/
+
+#ifndef XEUS_JSON_HPP
+#define XEUS_JSON_HPP
+
+// Remove annoying false positive warning on GCC: json.hpp:1394:23: warning: potential null pointer dereference
+// See https://github.com/nlohmann/json/issues/3525
+#ifdef __GNUC__
+#   pragma GCC diagnostic push
+#   pragma GCC diagnostic ignored "-Wnull-dereference"
+#   include "nlohmann/json.hpp"
+#   pragma GCC diagnostic pop
+#else
+#   include "nlohmann/json.hpp"
+#endif
+
+#endif
+
diff --git a/include/xeus/xkernel.hpp b/include/xeus/xkernel.hpp
@@ -10,18 +10,19 @@
 #ifndef XEUS_KERNEL_HPP
 #define XEUS_KERNEL_HPP
 
-#include "xdebugger.hpp"
-#include "xeus.hpp"
-#include "xeus_context.hpp"
-#include "xhistory_manager.hpp"
-#include "xinterpreter.hpp"
-#include "xkernel_configuration.hpp"
-#include "xserver.hpp"
-#include "xlogger.hpp"
 #include <memory>
 #include <string>
 #include <functional>
 
+#include "xeus/xdebugger.hpp"
+#include "xeus/xeus.hpp"
+#include "xeus/xeus_context.hpp"
+#include "xeus/xhistory_manager.hpp"
+#include "xeus/xinterpreter.hpp"
+#include "xeus/xkernel_configuration.hpp"
+#include "xeus/xserver.hpp"
+#include "xeus/xlogger.hpp"
+
 namespace xeus
 {
     class xkernel_core;

diff --git a/include/xeus/xkernel_configuration.hpp b/include/xeus/xkernel_configuration.hpp
@@ -12,7 +12,7 @@
 
 #include <string>
 
-#include "xeus.hpp"
+#include "xeus/xeus.hpp"
 
 namespace xeus
 {

diff --git a/include/xeus/xlogger.hpp b/include/xeus/xlogger.hpp
@@ -12,10 +12,9 @@
 
 #include <memory>
 
-#include "nlohmann/json.hpp"
-
-#include "xeus.hpp"
-#include "xmessage.hpp"
+#include "xeus/xeus.hpp"
+#include "xeus/xjson.hpp"
+#include "xeus/xmessage.hpp"
 
 namespace nl = nlohmann;
 

diff --git a/include/xeus/xmessage.hpp b/include/xeus/xmessage.hpp
@@ -13,8 +13,8 @@
 #include <string>
 #include <vector>
 
-#include "nlohmann/json.hpp"
-#include "xeus.hpp"
+#include "xeus/xeus.hpp"
+#include "xeus/xjson.hpp"
 
 namespace nl = nlohmann;
 

diff --git a/include/xeus/xrequest_context.hpp b/include/xeus/xrequest_context.hpp
@@ -12,7 +12,7 @@
 #include <vector>
 
 #include "xeus/xeus.hpp"
-#include "nlohmann/json.hpp" 
+#include "xeus/xjson.hpp" 
 #include "xeus/xmessage.hpp" // for xmessage::guid_list
 #include "xeus/xserver.hpp"  // for channel
 

diff --git a/include/xeus/xserver.hpp b/include/xeus/xserver.hpp
@@ -12,10 +12,10 @@
 
 #include <functional>
 
-#include "xeus.hpp"
-#include "xkernel_configuration.hpp"
-#include "xcontrol_messenger.hpp"
-#include "xmessage.hpp"
+#include "xeus/xeus.hpp"
+#include "xeus/xkernel_configuration.hpp"
+#include "xeus/xcontrol_messenger.hpp"
+#include "xeus/xmessage.hpp"
 
 namespace xeus
 {

diff --git a/include/xeus/xsystem.hpp b/include/xeus/xsystem.hpp
@@ -12,7 +12,7 @@
 
 #include <string>
 
-#include "xeus.hpp"
+#include "xeus/xeus.hpp"
 
 namespace xeus
 {

diff --git a/src/xhistory_manager.cpp b/src/xhistory_manager.cpp
@@ -10,8 +10,6 @@
 #include <string>
 #include <vector>
 
-#include "nlohmann/json.hpp"
-
 #include "xeus/xhistory_manager.hpp"
 #include "xin_memory_history_manager.hpp"
 

diff --git a/src/xin_memory_history_manager.cpp b/src/xin_memory_history_manager.cpp
@@ -12,7 +12,7 @@
 #include <string>
 #include <regex>
 
-#include "nlohmann/json.hpp"
+#include "xeus/xjson.hpp"
 
 #include "xin_memory_history_manager.hpp"
 

diff --git a/src/xkernel_configuration.cpp b/src/xkernel_configuration.cpp
@@ -10,8 +10,7 @@
 #include <fstream>
 #include <string>
 
-#include "nlohmann/json.hpp"
-
+#include "xeus/xjson.hpp"
 #include "xeus/xkernel_configuration.hpp"
 
 namespace nl = nlohmann;

diff --git a/src/xkernel_core.hpp b/src/xkernel_core.hpp
@@ -68,7 +68,6 @@ namespace xeus
         xcomm_manager& comm_manager() & noexcept;
         const xcomm_manager& comm_manager() const & noexcept;
         xcomm_manager comm_manager() const && noexcept;
-        const nl::json& parent_header(channel c) const noexcept;
 
     private:
 

diff --git a/src/xlogger_impl.cpp b/src/xlogger_impl.cpp
@@ -10,8 +10,7 @@
 #include <fstream>
 #include <iostream>
 
-#include "nlohmann/json.hpp"
-
+#include "xeus/xjson.hpp"
 #include "xeus/xmessage.hpp"
 #include "xlogger_impl.hpp"