j3d1/json
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #2332 from nlohmann/issue2330

Browse source 
Fix lexer to properly cope with repeated comments
This commit is contained in:
Niels Lohmann 2020-08-01 12:29:33 +02:00 committed by GitHub
commit 8a54617240
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/nlohmann/detail/input/lexer.hpp
View file

@ -1511,7 +1511,7 @@ scan_number_done:
skip_whitespace(); skip_whitespace();
// ignore comments // ignore comments
if (ignore_comments && current == '/') while (ignore_comments && current == '/')
{ {
if (!scan_comment()) if (!scan_comment())
{ {

2
single_include/nlohmann/json.hpp
View file

@ -7390,7 +7390,7 @@ scan_number_done:
skip_whitespace(); skip_whitespace();
// ignore comments // ignore comments
if (ignore_comments && current == '/') while (ignore_comments && current == '/')
{ {
if (!scan_comment()) if (!scan_comment())
{ {

3
test/src/unit-class_lexer.cpp
View file

@ -241,5 +241,8 @@ TEST_CASE("lexer class")
CHECK((scan_string("/* true */", true) == json::lexer::token_type::end_of_input)); CHECK((scan_string("/* true */", true) == json::lexer::token_type::end_of_input));
CHECK((scan_string("/*/**/", true) == json::lexer::token_type::end_of_input)); CHECK((scan_string("/*/**/", true) == json::lexer::token_type::end_of_input));
CHECK((scan_string("/*/* */", true) == json::lexer::token_type::end_of_input)); CHECK((scan_string("/*/* */", true) == json::lexer::token_type::end_of_input));
CHECK((scan_string("//\n//\n", true) == json::lexer::token_type::end_of_input));
CHECK((scan_string("/**//**//**/", true) == json::lexer::token_type::end_of_input));
} }
} }

7
test/src/unit-regression2.cpp
View file

@ -478,4 +478,11 @@ TEST_CASE("regression tests 2")
CHECK(jsonObj["aaaa"] == 11); CHECK(jsonObj["aaaa"] == 11);
CHECK(jsonObj["bbb"] == 222); CHECK(jsonObj["bbb"] == 222);
} }
SECTION("issue #2330 - ignore_comment=true fails on multiple consecutive lines starting with comments")
{
std::string ss = "//\n//\n{\n}\n";
json j = json::parse(ss, nullptr, true, true);
CHECK(j.dump() == "{}");
}
} }