Merge pull request #643 from theodelrieu/refacto/split_basic_json

Refacto/split basic json
This commit is contained in:
Niels Lohmann 2017-07-09 23:12:35 +02:00 committed by GitHub
commit 7dee868a42
4 changed files with 7007 additions and 6791 deletions

12880
src/json.hpp

File diff suppressed because it is too large Load diff

View file

@ -36,7 +36,7 @@ using nlohmann::json;
json::lexer::token_type scan_string(const char* s); json::lexer::token_type scan_string(const char* s);
json::lexer::token_type scan_string(const char* s) json::lexer::token_type scan_string(const char* s)
{ {
return json::lexer(json::input_adapter::create(s)).scan(); return json::lexer(nlohmann::detail::input_adapter_factory::create(s)).scan();
} }
TEST_CASE("lexer class") TEST_CASE("lexer class")

File diff suppressed because it is too large Load diff

View file

@ -53,7 +53,7 @@ TEST_CASE("convenience functions")
const char* escaped) const char* escaped)
{ {
std::stringstream ss; std::stringstream ss;
json::serializer s(json::output_adapter<char>::create(ss), ' '); json::serializer s(nlohmann::detail::output_adapter_factory<char>::create(ss), ' ');
s.dump_escaped(original); s.dump_escaped(original);
CHECK(ss.str() == escaped); CHECK(ss.str() == escaped);
}; };