feedc0de/ArduinoJson
1
0 Fork 0
forked from bblanchon/ArduinoJson
Code Pull Requests Activity

Fixed parsing of comments (issue #421)

Browse Source
This commit is contained in:
Benoit Blanchon committed 2017-01-17 21:48:13 +01:00
1 parent 2e7d498865
commit 17a17c8957
3 files changed
+22 -29
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

include/ArduinoJson/Deserialization/Comments.hpp
+12 -24
View File
@@ -27,39 +27,27 @@ void skipSpacesAndComments(TInput& input) {
// C-style block comment
case '*':
input.move(); // skip '/'
input.move(); // skip '*'
// no need to skip '*'
for (;;) {
switch (input.current()) {
case '\0':
return;
case '*':
input.move(); // skip '*'
if (input.current() == '/') {
input.move(); // skip '/'
return;
}
break;
default:
input.move();
input.move();
if (input.current() == '\0') return;
if (input.current() == '*' && input.next() == '/') {
input.move(); // skip '*'
input.move(); // skip '/'
break;
}
}
break;
// C++-style line comment
case '/':
input.move(); // skip '/'
// not need to skip "//"
for (;;) {
switch (input.current()) {
case '\0':
return;
case '\n':
input.move();
return;
default:
input.move();
}
input.move();
if (input.current() == '\0') return;
if (input.current() == '\n') break;
}
return;
break;
// not a comment, just a '/'
default: