diff options
| author | Chris Lattner <sabre@nondot.org> | 2010-05-05 23:51:28 +0000 |
|---|---|---|
| committer | Chris Lattner <sabre@nondot.org> | 2010-05-05 23:51:28 +0000 |
| commit | 851f87c6c98af936ba68c5ca8962df3832f8a5fc (patch) | |
| tree | 8e3733b4c3089c1d81c6dd7338acd6c09c46d4c3 /lib/MC/MCParser/AsmLexer.cpp | |
| parent | 29402132f3e890a2771818f44987ede213297431 (diff) | |
| download | llvm-851f87c6c98af936ba68c5ca8962df3832f8a5fc.tar.gz llvm-851f87c6c98af936ba68c5ca8962df3832f8a5fc.tar.bz2 llvm-851f87c6c98af936ba68c5ca8962df3832f8a5fc.tar.xz | |
fix rdar://7946934 - in some limited cases, the assembler should
allow $ at the start of a symbol name.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@103137 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/MC/MCParser/AsmLexer.cpp')
| -rw-r--r-- | lib/MC/MCParser/AsmLexer.cpp | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/lib/MC/MCParser/AsmLexer.cpp b/lib/MC/MCParser/AsmLexer.cpp index 1183312784..f157a89609 100644 --- a/lib/MC/MCParser/AsmLexer.cpp +++ b/lib/MC/MCParser/AsmLexer.cpp @@ -69,16 +69,26 @@ int AsmLexer::getNextChar() { } } -/// LexIdentifier: [a-zA-Z_.][a-zA-Z0-9_$.@]* +/// LexIdentifier: [a-zA-Z_.$][a-zA-Z0-9_$.@]* +/// LexIdentifier: . +/// LexIdentifier: $ AsmToken AsmLexer::LexIdentifier() { while (isalnum(*CurPtr) || *CurPtr == '_' || *CurPtr == '$' || *CurPtr == '.' || *CurPtr == '@') ++CurPtr; // Handle . as a special case. - if (CurPtr == TokStart+1 && TokStart[0] == '.') - return AsmToken(AsmToken::Dot, StringRef(TokStart, 1)); - + if (CurPtr == TokStart+1) + if (TokStart[0] == '.') + return AsmToken(AsmToken::Dot, StringRef(TokStart, 1)); + + // Handle $ as a special case. $foo is an identifier, $42 is not. + if (TokStart[0] == '$' && + (CurPtr-TokStart == 1 || isdigit(TokStart[1]) || TokStart[1] == '"')) { + CurPtr = TokStart+1; + return AsmToken(AsmToken::Dollar, StringRef(TokStart, 1)); + } + return AsmToken(AsmToken::Identifier, StringRef(TokStart, CurPtr - TokStart)); } @@ -252,8 +262,8 @@ AsmToken AsmLexer::LexToken() { switch (CurChar) { default: - // Handle identifier: [a-zA-Z_.][a-zA-Z0-9_$.@]* - if (isalpha(CurChar) || CurChar == '_' || CurChar == '.') + // Handle identifier: [a-zA-Z_.$][a-zA-Z0-9_$.@]* + if (isalpha(CurChar) || CurChar == '_' || CurChar == '.' || CurChar == '$') return LexIdentifier(); // Unknown character, emit an error. @@ -279,7 +289,6 @@ AsmToken AsmLexer::LexToken() { case '}': return AsmToken(AsmToken::RCurly, StringRef(TokStart, 1)); case '*': return AsmToken(AsmToken::Star, StringRef(TokStart, 1)); case ',': return AsmToken(AsmToken::Comma, StringRef(TokStart, 1)); - case '$': return AsmToken(AsmToken::Dollar, StringRef(TokStart, 1)); case '=': if (*CurPtr == '=') return ++CurPtr, AsmToken(AsmToken::EqualEqual, StringRef(TokStart, 2)); |