6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-01-26 07:34:06 +00:00
Code Issues Projects Releases Wiki Activity

MC/AsmParser: Fix a bug in macro argument parsing, which was dropping

Browse Source 
parentheses from argument lists.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@110692 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Daniel Dunbar 2010-08-10 17:38:52 +00:00
parent 1b73052140
commit e25c6b95ce
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1032,12 +1032,14 @@ bool AsmParser::HandleMacroEntry(StringRef Name, SMLoc NameLoc,
// list. // list.
if (ParenLevel == 0 && Lexer.is(AsmToken::Comma)) { if (ParenLevel == 0 && Lexer.is(AsmToken::Comma)) {
MacroArguments.push_back(std::vector<AsmToken>()); MacroArguments.push_back(std::vector<AsmToken>());
} else if (Lexer.is(AsmToken::LParen)) {
++ParenLevel;
} else if (Lexer.is(AsmToken::RParen)) {
if (ParenLevel)
--ParenLevel;
} else { } else {
// Adjust the current parentheses level.
if (Lexer.is(AsmToken::LParen))
++ParenLevel;
else if (Lexer.is(AsmToken::RParen) && ParenLevel)
--ParenLevel;
// Append the token to the current argument list.
MacroArguments.back().push_back(getTok()); MacroArguments.back().push_back(getTok());
} }
Lex(); Lex();

7
test/MC/AsmParser/macros.s
View File

@ -30,3 +30,10 @@ test2 10
// CHECK: .globl "1 23 $3 2" // CHECK: .globl "1 23 $3 2"
test3 1,2 3 test3 1,2 3
.macro test4
.globl "$0 -- $1"
.endmacro
// CHECK: .globl "ab)(,) -- (cd)"
test4 a b)(,),(cd)