caio/clang-p2996
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[ELF] Replace some while (peek() != ")" && !atEOF()) with till

Browse Source
This commit is contained in:
Fangrui Song
2024-07-26 17:19:04 -07:00
parent 2a89356d64
commit 10bb296dfc
1 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
lld/ELF/ScriptParser.cpp
View File

@@ -375,10 +375,9 @@ void ScriptParser::readAsNeeded() {
expect("(");
bool orig = config->asNeeded;
config->asNeeded = true;
while (peek() != ")" && !atEOF())
addFile(unquote(next()));
while (auto tok = till(")"))
addFile(unquote(tok));
config->asNeeded = orig;
expect(")");
}
void ScriptParser::readEntry() {
@@ -392,9 +391,8 @@ void ScriptParser::readEntry() {
void ScriptParser::readExtern() {
expect("(");
while (peek() != ")" && !atEOF())
config->undefined.push_back(unquote(next()));
expect(")");
while (auto tok = till(")"))
config->undefined.push_back(unquote(tok));
}
void ScriptParser::readGroup() {
@@ -427,13 +425,12 @@ void ScriptParser::readInclude() {
void ScriptParser::readInput() {
expect("(");
while (peek() != ")" && !atEOF()) {
if (consume("AS_NEEDED"))
while (auto tok = till(")")) {
if (tok == "AS_NEEDED")
readAsNeeded();
else
addFile(unquote(next()));
addFile(unquote(tok));
}
expect(")");
}
void ScriptParser::readOutput() {
@@ -712,10 +709,8 @@ static int precedence(StringRef op) {
StringMatcher ScriptParser::readFilePatterns() {
StringMatcher Matcher;
while (peek() != ")" && !atEOF())
Matcher.addPattern(SingleStringMatcher(next()));
expect(")");
while (auto tok = till(")"))
Matcher.addPattern(SingleStringMatcher(tok));
return Matcher;
}