commit f4155e47278100296ba2a8d149cf4ae5b3581e44
author Niels Lohmann <niels.lohmann@gmail.com> Sat Aug 01 15:32:21 2020 +0200
committer GitHub <noreply@github.com> Sat Aug 01 15:32:21 2020 +0200
tree 176876ce18ca5475ff35fa1dce64084a00e4e243
parent 8a54617240607be94ac428970273295ed8e23618
parent 0326e4e2a69d5cbb3d92b5b982b077a54084731b

Merge pull request #2333 from nlohmann/fallthrough

Fix fallthrough warning

include/nlohmann/detail/input/lexer.hpp

diff --git a/include/nlohmann/detail/input/lexer.hpp b/include/nlohmann/detail/input/lexer.hpp
index f53ebfe..0a96013 100644
--- a/include/nlohmann/detail/input/lexer.hpp
+++ b/include/nlohmann/detail/input/lexer.hpp
@@ -1511,7 +1511,7 @@
         skip_whitespace();
 
         // ignore comments
-        if (ignore_comments && current == '/')
+        while (ignore_comments && current == '/')
         {
             if (!scan_comment())
             {

single_include/nlohmann/json.hpp

diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp
index 4462da8..41c1711 100644
--- a/single_include/nlohmann/json.hpp
+++ b/single_include/nlohmann/json.hpp
@@ -7390,7 +7390,7 @@
         skip_whitespace();
 
         // ignore comments
-        if (ignore_comments && current == '/')
+        while (ignore_comments && current == '/')
         {
             if (!scan_comment())
             {

test/src/unit-class_lexer.cpp

diff --git a/test/src/unit-class_lexer.cpp b/test/src/unit-class_lexer.cpp
index 0f544d5..6d4ede8 100644
--- a/test/src/unit-class_lexer.cpp
+++ b/test/src/unit-class_lexer.cpp
@@ -241,5 +241,8 @@
         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("//\n//\n", true) == json::lexer::token_type::end_of_input));
+        CHECK((scan_string("/**//**//**/", true) == json::lexer::token_type::end_of_input));
     }
 }

test/src/unit-regression2.cpp

diff --git a/test/src/unit-regression2.cpp b/test/src/unit-regression2.cpp
index d445f06..1f8c527 100644
--- a/test/src/unit-regression2.cpp
+++ b/test/src/unit-regression2.cpp
@@ -478,4 +478,11 @@
         CHECK(jsonObj["aaaa"] == 11);
         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() == "{}");
+    }
 }