Merge pull request #1006 from agrianius/dump-template

dump to alternative string type, as defined in basic_json template
This commit is contained in:
Niels Lohmann 2018-03-12 18:41:59 +01:00 committed by GitHub
commit 0cab3b2c8e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 209 additions and 14 deletions

View file

@ -68,11 +68,11 @@ class output_stream_adapter : public output_adapter_protocol<CharType>
}; };
/// output adapter for basic_string /// output adapter for basic_string
template<typename CharType> template<typename CharType, typename StringType = std::basic_string<CharType>>
class output_string_adapter : public output_adapter_protocol<CharType> class output_string_adapter : public output_adapter_protocol<CharType>
{ {
public: public:
explicit output_string_adapter(std::basic_string<CharType>& s) : str(s) {} explicit output_string_adapter(StringType& s) : str(s) {}
void write_character(CharType c) override void write_character(CharType c) override
{ {
@ -85,10 +85,10 @@ class output_string_adapter : public output_adapter_protocol<CharType>
} }
private: private:
std::basic_string<CharType>& str; StringType& str;
}; };
template<typename CharType> template<typename CharType, typename StringType = std::basic_string<CharType>>
class output_adapter class output_adapter
{ {
public: public:
@ -98,8 +98,8 @@ class output_adapter
output_adapter(std::basic_ostream<CharType>& s) output_adapter(std::basic_ostream<CharType>& s)
: oa(std::make_shared<output_stream_adapter<CharType>>(s)) {} : oa(std::make_shared<output_stream_adapter<CharType>>(s)) {}
output_adapter(std::basic_string<CharType>& s) output_adapter(StringType& s)
: oa(std::make_shared<output_string_adapter<CharType>>(s)) {} : oa(std::make_shared<output_string_adapter<CharType, StringType>>(s)) {}
operator output_adapter_t<CharType>() operator output_adapter_t<CharType>()
{ {

View file

@ -1947,7 +1947,7 @@ class basic_json
const bool ensure_ascii = false) const const bool ensure_ascii = false) const
{ {
string_t result; string_t result;
serializer s(detail::output_adapter<char>(result), indent_char); serializer s(detail::output_adapter<char, string_t>(result), indent_char);
if (indent >= 0) if (indent >= 0)
{ {

View file

@ -4777,11 +4777,11 @@ class output_stream_adapter : public output_adapter_protocol<CharType>
}; };
/// output adapter for basic_string /// output adapter for basic_string
template<typename CharType> template<typename CharType, typename StringType = std::basic_string<CharType>>
class output_string_adapter : public output_adapter_protocol<CharType> class output_string_adapter : public output_adapter_protocol<CharType>
{ {
public: public:
explicit output_string_adapter(std::basic_string<CharType>& s) : str(s) {} explicit output_string_adapter(StringType& s) : str(s) {}
void write_character(CharType c) override void write_character(CharType c) override
{ {
@ -4794,10 +4794,10 @@ class output_string_adapter : public output_adapter_protocol<CharType>
} }
private: private:
std::basic_string<CharType>& str; StringType& str;
}; };
template<typename CharType> template<typename CharType, typename StringType = std::basic_string<CharType>>
class output_adapter class output_adapter
{ {
public: public:
@ -4807,8 +4807,8 @@ class output_adapter
output_adapter(std::basic_ostream<CharType>& s) output_adapter(std::basic_ostream<CharType>& s)
: oa(std::make_shared<output_stream_adapter<CharType>>(s)) {} : oa(std::make_shared<output_stream_adapter<CharType>>(s)) {}
output_adapter(std::basic_string<CharType>& s) output_adapter(StringType& s)
: oa(std::make_shared<output_string_adapter<CharType>>(s)) {} : oa(std::make_shared<output_string_adapter<CharType, StringType>>(s)) {}
operator output_adapter_t<CharType>() operator output_adapter_t<CharType>()
{ {
@ -11556,7 +11556,7 @@ class basic_json
const bool ensure_ascii = false) const const bool ensure_ascii = false) const
{ {
string_t result; string_t result;
serializer s(detail::output_adapter<char>(result), indent_char); serializer s(detail::output_adapter<char, string_t>(result), indent_char);
if (indent >= 0) if (indent >= 0)
{ {

View file

@ -0,0 +1,195 @@
/*
__ _____ _____ _____
__| | __| | | | JSON for Modern C++ (test suite)
| | |__ | | | | | | version 3.1.1
|_____|_____|_____|_|___| https://github.com/nlohmann/json
Licensed under the MIT License <http://opensource.org/licenses/MIT>.
Copyright (c) 2018 Vitaliy Manushkin <agri@akamo.info>.
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
*/
#include "catch.hpp"
#include <nlohmann/json.hpp>
#include <string>
#include <utility>
/*
* This is virtually a string class.
* It covers std::string under the hood.
*/
class alt_string
{
public:
using value_type = std::string::value_type;
alt_string(const char* str): str_impl(str) {}
alt_string(const char* str, size_t count): str_impl(str, count) {}
alt_string(size_t count, char chr): str_impl(count, chr) {}
alt_string() = default;
template <typename...TParams>
alt_string& append(TParams&& ...params)
{
str_impl.append(std::forward<TParams>(params)...);
return *this;
}
void push_back(char c)
{
str_impl.push_back(c);
}
template <typename op_type>
bool operator==(op_type&& op) const
{
return str_impl == op;
}
template <typename op_type>
bool operator!=(op_type&& op) const
{
return str_impl != op;
}
size_t size() const noexcept
{
return str_impl.size();
}
void resize (size_t n)
{
str_impl.resize(n);
}
void resize (size_t n, char c)
{
str_impl.resize(n, c);
}
template <typename op_type>
bool operator<(op_type&& op) const
{
return str_impl < op;
}
bool operator<(const alt_string& op) const
{
return str_impl < op.str_impl;
}
const char* c_str() const
{
return str_impl.c_str();
}
char& operator[](int index)
{
return str_impl[index];
}
const char& operator[](int index) const
{
return str_impl[index];
}
char& back()
{
return str_impl.back();
}
const char& back() const
{
return str_impl.back();
}
private:
std::string str_impl;
};
using alt_json = nlohmann::basic_json <
std::map,
std::vector,
alt_string,
bool,
std::int64_t,
std::uint64_t,
double,
std::allocator,
nlohmann::adl_serializer >;
TEST_CASE("alternative string type")
{
SECTION("dump")
{
{
alt_json doc;
doc["pi"] = 3.141;
alt_string dump = doc.dump();
CHECK(dump == R"({"pi":3.141})");
}
{
alt_json doc;
doc["happy"] = true;
alt_string dump = doc.dump();
CHECK(dump == R"({"happy":true})");
}
{
alt_json doc;
doc["name"] = "I'm Batman";
alt_string dump = doc.dump();
CHECK(dump == R"({"name":"I'm Batman"})");
}
{
alt_json doc;
doc["nothing"] = nullptr;
alt_string dump = doc.dump();
CHECK(dump == R"({"nothing":null})");
}
{
alt_json doc;
doc["answer"]["everything"] = 42;
alt_string dump = doc.dump();
CHECK(dump == R"({"answer":{"everything":42}})");
}
{
alt_json doc;
doc["list"] = { 1, 0, 2 };
alt_string dump = doc.dump();
CHECK(dump == R"({"list":[1,0,2]})");
}
{
alt_json doc;
doc["list"] = { 1, 0, 2 };
alt_string dump = doc.dump();
CHECK(dump == R"({"list":[1,0,2]})");
}
}
}