[llvm] 90fbc5b - [MCAsmParser] Simplify. NFC
Fangrui Song via llvm-commits
llvm-commits at lists.llvm.org
Wed May 15 20:39:00 PDT 2024
Author: Fangrui Song
Date: 2024-05-15T20:38:55-07:00
New Revision: 90fbc5bbcdc7d35d57157e4cc0459470d473f2ae
URL: https://github.com/llvm/llvm-project/commit/90fbc5bbcdc7d35d57157e4cc0459470d473f2ae
DIFF: https://github.com/llvm/llvm-project/commit/90fbc5bbcdc7d35d57157e4cc0459470d473f2ae.diff
LOG: [MCAsmParser] Simplify. NFC
Added:
Modified:
llvm/lib/MC/MCParser/AsmParser.cpp
llvm/lib/MC/MCParser/MCAsmParser.cpp
Removed:
################################################################################
diff --git a/llvm/lib/MC/MCParser/AsmParser.cpp b/llvm/lib/MC/MCParser/AsmParser.cpp
index 46c1caa940c5b..009465d11d781 100644
--- a/llvm/lib/MC/MCParser/AsmParser.cpp
+++ b/llvm/lib/MC/MCParser/AsmParser.cpp
@@ -833,11 +833,8 @@ AsmParser::~AsmParser() {
void AsmParser::printMacroInstantiations() {
// Print the active macro instantiation stack.
- for (std::vector<MacroInstantiation *>::const_reverse_iterator
- it = ActiveMacros.rbegin(),
- ie = ActiveMacros.rend();
- it != ie; ++it)
- printMessage((*it)->InstantiationLoc, SourceMgr::DK_Note,
+ for (MacroInstantiation *M : reverse(ActiveMacros))
+ printMessage(M->InstantiationLoc, SourceMgr::DK_Note,
"while in macro instantiation");
}
@@ -1510,9 +1507,7 @@ bool AsmParser::parseExpression(const MCExpr *&Res, SMLoc &EndLoc) {
// As a special case, we support 'a op b @ modifier' by rewriting the
// expression to include the modifier. This is inefficient, but in general we
// expect users to use 'a at modifier op b'.
- if (Lexer.getKind() == AsmToken::At) {
- Lex();
-
+ if (parseOptionalToken(AsmToken::At)) {
if (Lexer.isNot(AsmToken::Identifier))
return TokError("unexpected symbol modifier following '@'");
@@ -2708,10 +2703,8 @@ bool AsmParser::parseMacroArgument(MCAsmMacroArgument &MA, bool Vararg) {
if (Lexer.is(AsmToken::Comma))
break;
- if (Lexer.is(AsmToken::Space)) {
+ if (parseOptionalToken(AsmToken::Space))
SpaceEaten = true;
- Lexer.Lex(); // Eat spaces
- }
// Spaces can delimit parameters, but could also be part an expression.
// If the token after a space is an operator, add the token and the next
@@ -2722,9 +2715,7 @@ bool AsmParser::parseMacroArgument(MCAsmMacroArgument &MA, bool Vararg) {
Lexer.Lex();
// Whitespace after an operator can be ignored.
- if (Lexer.is(AsmToken::Space))
- Lexer.Lex();
-
+ parseOptionalToken(AsmToken::Space);
continue;
}
}
@@ -2865,8 +2856,7 @@ bool AsmParser::parseMacroArguments(const MCAsmMacro *M,
return Failure;
}
- if (Lexer.is(AsmToken::Comma))
- Lex();
+ parseOptionalToken(AsmToken::Comma);
}
return TokError("too many positional arguments");
diff --git a/llvm/lib/MC/MCParser/MCAsmParser.cpp b/llvm/lib/MC/MCParser/MCAsmParser.cpp
index bfeba3108cb4b..236585fc90829 100644
--- a/llvm/lib/MC/MCParser/MCAsmParser.cpp
+++ b/llvm/lib/MC/MCParser/MCAsmParser.cpp
@@ -99,7 +99,6 @@ bool MCAsmParser::TokError(const Twine &Msg, SMRange Range) {
}
bool MCAsmParser::Error(SMLoc L, const Twine &Msg, SMRange Range) {
-
MCPendingError PErr;
PErr.Loc = L;
Msg.toVector(PErr.Msg);
More information about the llvm-commits
mailing list