amorfo77/inja
1
0
Fork 0
mirror of https://github.com/pantor/inja.git synced 2026-03-04 00:06:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

unify json data type

Browse Source
This commit is contained in:
pantor
2021-09-01 16:40:43 +02:00
parent 4505fd0508
commit 12a2c9bbf2
8 changed files with 16 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/inja/environment.hpp
View File

@@ -7,8 +7,6 @@
#include <sstream>
#include <string>
#include <nlohmann/json.hpp>
#include "config.hpp"
#include "function_storage.hpp"
#include "parser.hpp"
@@ -19,8 +17,6 @@
namespace inja {
using json = nlohmann::json;
/*!
* \brief Class for changing the configuration.
*/

2
include/inja/function_storage.hpp
View File

@@ -7,8 +7,6 @@
namespace inja {
using json = nlohmann::json;
using Arguments = std::vector<const json *>;
using CallbackFunction = std::function<json(Arguments &args)>;
using VoidCallbackFunction = std::function<void(Arguments &args)>;

4
include/inja/inja.hpp
View File

@@ -27,6 +27,10 @@ SOFTWARE.
#include <nlohmann/json.hpp>
namespace inja {
using json = nlohmann::json;
}
#if (defined(__cpp_exceptions) || defined(__EXCEPTIONS) || defined(_CPPUNWIND)) && !defined(INJA_NOEXCEPTION)
#ifndef INJA_THROW
#define INJA_THROW(exception) throw exception

6
include/inja/node.hpp
View File

@@ -4,8 +4,6 @@
#include <string>
#include <utility>
#include <nlohmann/json.hpp>
#include "function_storage.hpp"
#include "string_view.hpp"
@@ -100,9 +98,9 @@ public:
class LiteralNode : public ExpressionNode {
public:
const nlohmann::json value;
const json value;
explicit LiteralNode(const nlohmann::json& value, size_t pos) : ExpressionNode(pos), value(value) { }
explicit LiteralNode(const json& value, size_t pos) : ExpressionNode(pos), value(value) { }
void accept(NodeVisitor& v) const {
v.visit(*this);

1
include/inja/parser.hpp
View File

@@ -17,7 +17,6 @@
#include "token.hpp"
#include "utils.hpp"
#include <nlohmann/json.hpp>
namespace inja {

4
include/inja/renderer.hpp
View File

@@ -7,8 +7,6 @@
#include <utility>
#include <vector>
#include <nlohmann/json.hpp>
#include "config.hpp"
#include "exceptions.hpp"
#include "node.hpp"
@@ -689,7 +687,7 @@ class Renderer : public NodeVisitor {
std::string ptr = node.key;
replace_substring(ptr, ".", "/");
ptr = "/" + ptr;
json_additional_data[nlohmann::json::json_pointer(ptr)] = *eval_expression_list(node.expression);
json_additional_data[json::json_pointer(ptr)] = *eval_expression_list(node.expression);
}
public:

21
single_include/inja/inja.hpp
View File

@@ -27,6 +27,10 @@ SOFTWARE.
#include <nlohmann/json.hpp>
namespace inja {
using json = nlohmann::json;
}
#if (defined(__cpp_exceptions) || defined(__EXCEPTIONS) || defined(_CPPUNWIND)) && !defined(INJA_NOEXCEPTION)
#ifndef INJA_THROW
#define INJA_THROW(exception) throw exception
@@ -51,8 +55,6 @@ SOFTWARE.
#include <sstream>
#include <string>
#include <nlohmann/json.hpp>
// #include "config.hpp"
#ifndef INCLUDE_INJA_CONFIG_HPP_
#define INCLUDE_INJA_CONFIG_HPP_
@@ -1562,8 +1564,6 @@ struct RenderConfig {
namespace inja {
using json = nlohmann::json;
using Arguments = std::vector<const json *>;
using CallbackFunction = std::function<json(Arguments &args)>;
using VoidCallbackFunction = std::function<void(Arguments &args)>;
@@ -2367,8 +2367,6 @@ public:
#include <string>
#include <utility>
#include <nlohmann/json.hpp>
// #include "function_storage.hpp"
// #include "string_view.hpp"
@@ -2465,9 +2463,9 @@ public:
class LiteralNode : public ExpressionNode {
public:
const nlohmann::json value;
const json value;
explicit LiteralNode(const nlohmann::json& value, size_t pos) : ExpressionNode(pos), value(value) { }
explicit LiteralNode(const json& value, size_t pos) : ExpressionNode(pos), value(value) { }
void accept(NodeVisitor& v) const {
v.visit(*this);
@@ -2860,7 +2858,6 @@ using TemplateStorage = std::map<std::string, Template>;
// #include "utils.hpp"
#include <nlohmann/json.hpp>
namespace inja {
@@ -3498,8 +3495,6 @@ public:
#include <utility>
#include <vector>
#include <nlohmann/json.hpp>
// #include "config.hpp"
// #include "exceptions.hpp"
@@ -4185,7 +4180,7 @@ class Renderer : public NodeVisitor {
std::string ptr = node.key;
replace_substring(ptr, ".", "/");
ptr = "/" + ptr;
json_additional_data[nlohmann::json::json_pointer(ptr)] = *eval_expression_list(node.expression);
json_additional_data[json::json_pointer(ptr)] = *eval_expression_list(node.expression);
}
public:
@@ -4221,8 +4216,6 @@ public:
namespace inja {
using json = nlohmann::json;
/*!
* \brief Class for changing the configuration.
*/

5
test/benchmark.cpp
View File

@@ -3,14 +3,13 @@
#include "hayai/hayai.hpp"
#include <inja/inja.hpp>
using json = nlohmann::json;
inja::Environment env;
const std::string test_file_directory {"../test/data/benchmark/"};
json small_data = env.load_json(test_file_directory + "small_data.json");
json large_data = env.load_json(test_file_directory + "large_data.json");
auto small_data = env.load_json(test_file_directory + "small_data.json");
auto large_data = env.load_json(test_file_directory + "large_data.json");
std::string medium_template = env.load_file(test_file_directory + "medium_template.txt");
std::string large_template = env.load_file(test_file_directory + "large_template.txt");