lib/json
1
0
Fork 0
mirror of https://github.com/nlohmann/json.git synced 2025-07-27 00:41:05 +03:00
Code Activity

🔀 merge develop branch

Browse Source
This commit is contained in:
Niels Lohmann
2021-02-07 17:46:11 +01:00
parent 4917e7c259
commit 56a6dec0de
2 changed files with 575 additions and 385 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
include/nlohmann/detail/input/parser.hpp
View File

@ -389,15 +389,15 @@ class parser
// states.back() is false -> object // states.back() is false -> object
// comma -> next value // comma -> next value
if (get_token() == token_type::value_separator) if (get_token() == token_type::value_separator)
{
// parse key
if (JSON_HEDLEY_UNLIKELY(get_token() != token_type::value_string))
{ {
// parse key return sax->parse_error(m_lexer.get_position(),
if (JSON_HEDLEY_UNLIKELY(get_token() != token_type::value_string)) m_lexer.get_token_string(),
{ parse_error::create(101, m_lexer.get_position(), exception_message(token_type::value_string, "object key"), BasicJsonType()));
return sax->parse_error(m_lexer.get_position(),
m_lexer.get_token_string(),
parse_error::create(101, m_lexer.get_position(), exception_message(token_type::value_string, "object key"), BasicJsonType()));
} }
if (JSON_HEDLEY_UNLIKELY(!sax->key(m_lexer.get_string()))) if (JSON_HEDLEY_UNLIKELY(!sax->key(m_lexer.get_string())))
@ -405,12 +405,12 @@ class parser
return false; return false;
} }
// parse separator (:) // parse separator (:)
if (JSON_HEDLEY_UNLIKELY(get_token() != token_type::name_separator)) if (JSON_HEDLEY_UNLIKELY(get_token() != token_type::name_separator))
{ {
return sax->parse_error(m_lexer.get_position(), return sax->parse_error(m_lexer.get_position(),
m_lexer.get_token_string(), m_lexer.get_token_string(),
parse_error::create(101, m_lexer.get_position(), exception_message(token_type::name_separator, "object separator"), BasicJsonType())); parse_error::create(101, m_lexer.get_position(), exception_message(token_type::name_separator, "object separator"), BasicJsonType()));
} }
// parse values // parse values
@ -436,9 +436,9 @@ class parser
continue; continue;
} }
return sax->parse_error(m_lexer.get_position(), return sax->parse_error(m_lexer.get_position(),
m_lexer.get_token_string(), m_lexer.get_token_string(),
parse_error::create(101, m_lexer.get_position(), exception_message(token_type::end_object, "object"), BasicJsonType())); parse_error::create(101, m_lexer.get_position(), exception_message(token_type::end_object, "object"), BasicJsonType()));
} }
} }

926
single_include/nlohmann/json.hpp
View File

File diff suppressed because it is too large Load Diff