replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[MC] Return a std::string instead of taking it as an out parameter. Make two parser methods into static functions at file scope. NFC 

llvm-svn: 343020
This commit is contained in:
Craig Topper 2018-09-25 20:13:55 +00:00
parent 321d5d4802
commit d2aab83fa6
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
llvm/lib/MC/MCParser/AsmParser.cpp
View File

@ -260,8 +260,6 @@ public:
/// }
private:
bool isAltmacroString(SMLoc &StrLoc, SMLoc &EndLoc);
void altMacroString(StringRef AltMacroStr, std::string &Res);
bool parseStatement(ParseStatementInfo &Info,
MCAsmParserSemaCallback *SI);
bool parseCurlyBlockScope(SmallVectorImpl<AsmRewrite>& AsmStrRewrites);
@ -1327,7 +1325,7 @@ AsmParser::applyModifierToExpr(const MCExpr *E,
/// implementation. GCC does not fully support this feature and so we will not
/// support it.
/// TODO: Adding single quote as a string.
bool AsmParser::isAltmacroString(SMLoc &StrLoc, SMLoc &EndLoc) {
static bool isAltmacroString(SMLoc &StrLoc, SMLoc &EndLoc) {
assert((StrLoc.getPointer() != nullptr) &&
"Argument to the function cannot be a NULL value");
const char *CharPtr = StrLoc.getPointer();
@ -1345,12 +1343,14 @@ bool AsmParser::isAltmacroString(SMLoc &StrLoc, SMLoc &EndLoc) {
}
/// creating a string without the escape characters '!'.
void AsmParser::altMacroString(StringRef AltMacroStr,std::string &Res) {
static std::string altMacroString(StringRef AltMacroStr) {
std::string Res;
for (size_t Pos = 0; Pos < AltMacroStr.size(); Pos++) {
if (AltMacroStr[Pos] == '!')
Pos++;
Res += AltMacroStr[Pos];
}
return Res;
}
/// Parse an expression and return it.
@ -2452,9 +2452,7 @@ bool AsmParser::expandMacro(raw_svector_ostream &OS, StringRef Body,
else if (Lexer.IsaAltMacroMode() &&
Token.getString().front() == '<' &&
Token.is(AsmToken::String)) {
std::string Res;
altMacroString(Token.getStringContents(), Res);
OS << Res;
OS << altMacroString(Token.getStringContents());
}
// We expect no quotes around the string's contents when
// parsing for varargs.