RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 15:48:12 +00:00
Code Issues Activity Actions

AK+Everywhere: Make GenericLexer::ignore_until() stop before the value

Browse source 
`consume_until(foo)` stops before foo, and so does
`ignore_until(Predicate)`, so let's make the other `ignore_until()`
overloads consistent with that so they're less confusing.
This commit is contained in:
Sam Atkins 2023-02-28 11:11:39 +00:00 • committed by Sam Atkins
parent 0511059d60
commit c06f4ac6f5
5 changed files with 13 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Userland/Libraries/LibCpp/Preprocessor.cpp
View file

@ -72,21 +72,24 @@ static void consume_whitespace(GenericLexer& lexer)
lexer.ignore(2);
} else {
lexer.ignore_until('\n');
lexer.ignore();
break;
}
}
};
for (;;) {
if (lexer.consume_specific("//"sv))
if (lexer.consume_specific("//"sv)) {
ignore_line();
else if (lexer.consume_specific("/*"sv))
} else if (lexer.consume_specific("/*"sv)) {
lexer.ignore_until("*/");
else if (lexer.next_is("\\\n"sv))
lexer.ignore(2);
else if (lexer.is_eof() || !lexer.next_is(isspace))
} else if (lexer.next_is("\\\n"sv)) {
lexer.ignore(2);
} else if (lexer.is_eof() || !lexer.next_is(isspace)) {
break;
else
} else {
lexer.ignore();
}
}
}