amorfo77/json
1
0
Fork 0
mirror of https://github.com/nlohmann/json.git synced 2026-08-20 08:03:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: split the strict and non-strict paths in parser

Browse Source 
Folding the release_lookahead() call into the existing strict check left
the "in strict mode" comment on an else-if branch, and made the strict
condition in sax_parse() redundant with the branch it followed.

Signed-off-by: Niels Lohmann <mail@nlohmann.me>
This commit is contained in:
Niels Lohmann
2026-08-19 22:50:21 +02:00
parent 7fc3a7d87e
commit e5f84e1ebf
2 changed files with 80 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/nlohmann/detail/input/parser.hpp
+40 -28
View File
@@ -99,20 +99,23 @@ class parser
json_sax_dom_callback_parser<BasicJsonType, InputAdapterType> sdp(result, callback, allow_exceptions, &m_lexer); json_sax_dom_callback_parser<BasicJsonType, InputAdapterType> sdp(result, callback, allow_exceptions, &m_lexer);
sax_parse_internal(&sdp); sax_parse_internal(&sdp);
if (!strict) if (strict)
{
// in strict mode, input must be completely read
if (get_token() != token_type::end_of_input)
{
sdp.parse_error(m_lexer.get_position(),
m_lexer.get_token_string(),
parse_error::create(101, m_lexer.get_position(),
exception_message(token_type::end_of_input, "value"), nullptr));
}
}
else
{ {
// the caller keeps using the input: position it right after // the caller keeps using the input: position it right after
// the value by leaving the character that terminated it // the value by leaving the character that terminated it
m_lexer.release_lookahead(); m_lexer.release_lookahead();
} }
// in strict mode, input must be completely read
else if (get_token() != token_type::end_of_input)
{
sdp.parse_error(m_lexer.get_position(),
m_lexer.get_token_string(),
parse_error::create(101, m_lexer.get_position(),
exception_message(token_type::end_of_input, "value"), nullptr));
}
// in case of an error, return a discarded value // in case of an error, return a discarded value
if (sdp.is_errored()) if (sdp.is_errored())
@@ -133,18 +136,21 @@ class parser
json_sax_dom_parser<BasicJsonType, InputAdapterType> sdp(result, allow_exceptions, &m_lexer); json_sax_dom_parser<BasicJsonType, InputAdapterType> sdp(result, allow_exceptions, &m_lexer);
sax_parse_internal(&sdp); sax_parse_internal(&sdp);
if (!strict) if (strict)
{
// in strict mode, input must be completely read
if (get_token() != token_type::end_of_input)
{
sdp.parse_error(m_lexer.get_position(),
m_lexer.get_token_string(),
parse_error::create(101, m_lexer.get_position(), exception_message(token_type::end_of_input, "value"), nullptr));
}
}
else
{ {
// see above // see above
m_lexer.release_lookahead(); m_lexer.release_lookahead();
} }
// in strict mode, input must be completely read
else if (get_token() != token_type::end_of_input)
{
sdp.parse_error(m_lexer.get_position(),
m_lexer.get_token_string(),
parse_error::create(101, m_lexer.get_position(), exception_message(token_type::end_of_input, "value"), nullptr));
}
// in case of an error, return a discarded value // in case of an error, return a discarded value
if (sdp.is_errored()) if (sdp.is_errored())
@@ -176,18 +182,24 @@ class parser
(void)detail::is_sax_static_asserts<SAX, BasicJsonType> {}; (void)detail::is_sax_static_asserts<SAX, BasicJsonType> {};
const bool result = sax_parse_internal(sax); const bool result = sax_parse_internal(sax);
if (result && !strict) if (result)
{ {
// the caller keeps using the input: position it right after the if (strict)
// value by leaving the character that terminated it {
m_lexer.release_lookahead(); // strict mode: next byte must be EOF
} if (get_token() != token_type::end_of_input)
// strict mode: next byte must be EOF {
else if (result && strict && (get_token() != token_type::end_of_input)) return sax->parse_error(m_lexer.get_position(),
{ m_lexer.get_token_string(),
return sax->parse_error(m_lexer.get_position(), parse_error::create(101, m_lexer.get_position(), exception_message(token_type::end_of_input, "value"), nullptr));
m_lexer.get_token_string(), }
parse_error::create(101, m_lexer.get_position(), exception_message(token_type::end_of_input, "value"), nullptr)); }
else
{
// the caller keeps using the input: position it right after
// the value by leaving the character that terminated it
m_lexer.release_lookahead();
}
} }
return result; return result;
single_include/nlohmann/json.hpp
+40 -28
View File
@@ -14115,20 +14115,23 @@ class parser
json_sax_dom_callback_parser<BasicJsonType, InputAdapterType> sdp(result, callback, allow_exceptions, &m_lexer); json_sax_dom_callback_parser<BasicJsonType, InputAdapterType> sdp(result, callback, allow_exceptions, &m_lexer);
sax_parse_internal(&sdp); sax_parse_internal(&sdp);
if (!strict) if (strict)
{
// in strict mode, input must be completely read
if (get_token() != token_type::end_of_input)
{
sdp.parse_error(m_lexer.get_position(),
m_lexer.get_token_string(),
parse_error::create(101, m_lexer.get_position(),
exception_message(token_type::end_of_input, "value"), nullptr));
}
}
else
{ {
// the caller keeps using the input: position it right after // the caller keeps using the input: position it right after
// the value by leaving the character that terminated it // the value by leaving the character that terminated it
m_lexer.release_lookahead(); m_lexer.release_lookahead();
} }
// in strict mode, input must be completely read
else if (get_token() != token_type::end_of_input)
{
sdp.parse_error(m_lexer.get_position(),
m_lexer.get_token_string(),
parse_error::create(101, m_lexer.get_position(),
exception_message(token_type::end_of_input, "value"), nullptr));
}
// in case of an error, return a discarded value // in case of an error, return a discarded value
if (sdp.is_errored()) if (sdp.is_errored())
@@ -14149,18 +14152,21 @@ class parser
json_sax_dom_parser<BasicJsonType, InputAdapterType> sdp(result, allow_exceptions, &m_lexer); json_sax_dom_parser<BasicJsonType, InputAdapterType> sdp(result, allow_exceptions, &m_lexer);
sax_parse_internal(&sdp); sax_parse_internal(&sdp);
if (!strict) if (strict)
{
// in strict mode, input must be completely read
if (get_token() != token_type::end_of_input)
{
sdp.parse_error(m_lexer.get_position(),
m_lexer.get_token_string(),
parse_error::create(101, m_lexer.get_position(), exception_message(token_type::end_of_input, "value"), nullptr));
}
}
else
{ {
// see above // see above
m_lexer.release_lookahead(); m_lexer.release_lookahead();
} }
// in strict mode, input must be completely read
else if (get_token() != token_type::end_of_input)
{
sdp.parse_error(m_lexer.get_position(),
m_lexer.get_token_string(),
parse_error::create(101, m_lexer.get_position(), exception_message(token_type::end_of_input, "value"), nullptr));
}
// in case of an error, return a discarded value // in case of an error, return a discarded value
if (sdp.is_errored()) if (sdp.is_errored())
@@ -14192,18 +14198,24 @@ class parser
(void)detail::is_sax_static_asserts<SAX, BasicJsonType> {}; (void)detail::is_sax_static_asserts<SAX, BasicJsonType> {};
const bool result = sax_parse_internal(sax); const bool result = sax_parse_internal(sax);
if (result && !strict) if (result)
{ {
// the caller keeps using the input: position it right after the if (strict)
// value by leaving the character that terminated it {
m_lexer.release_lookahead(); // strict mode: next byte must be EOF
} if (get_token() != token_type::end_of_input)
// strict mode: next byte must be EOF {
else if (result && strict && (get_token() != token_type::end_of_input)) return sax->parse_error(m_lexer.get_position(),
{ m_lexer.get_token_string(),
return sax->parse_error(m_lexer.get_position(), parse_error::create(101, m_lexer.get_position(), exception_message(token_type::end_of_input, "value"), nullptr));
m_lexer.get_token_string(), }
parse_error::create(101, m_lexer.get_position(), exception_message(token_type::end_of_input, "value"), nullptr)); }
else
{
// the caller keeps using the input: position it right after
// the value by leaving the character that terminated it
m_lexer.release_lookahead();
}
} }
return result; return result;