aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorChris Lattner <sabre@nondot.org>2009-12-29 22:35:39 +0000
committerChris Lattner <sabre@nondot.org>2009-12-29 22:35:39 +0000
commit84d03b11d016821e0a2f31fc14a3cfd24b0df862 (patch)
tree4d941a8976cfd257f7781287b8086df92b700138 /lib
parentc17300f3c55fb0d44806578cf50f051c98780b61 (diff)
downloadexternal_llvm-84d03b11d016821e0a2f31fc14a3cfd24b0df862.zip
external_llvm-84d03b11d016821e0a2f31fc14a3cfd24b0df862.tar.gz
external_llvm-84d03b11d016821e0a2f31fc14a3cfd24b0df862.tar.bz2
simplify some code and unbreak the build by not consuming an
extra token. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@92279 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib')
-rw-r--r--lib/AsmParser/LLParser.cpp14
1 files changed, 4 insertions, 10 deletions
diff --git a/lib/AsmParser/LLParser.cpp b/lib/AsmParser/LLParser.cpp
index a849eb7..a41c596 100644
--- a/lib/AsmParser/LLParser.cpp
+++ b/lib/AsmParser/LLParser.cpp
@@ -503,28 +503,22 @@ bool LLParser::ParseMDNode(MDNode *&Result) {
return false;
}
-///ParseNamedMetadata:
+/// ParseNamedMetadata:
/// !foo = !{ !1, !2 }
bool LLParser::ParseNamedMetadata() {
assert(Lex.getKind() == lltok::NamedOrCustomMD);
Lex.Lex();
std::string Name = Lex.getStrVal();
- if (ParseToken(lltok::equal, "expected '=' here"))
+ if (ParseToken(lltok::equal, "expected '=' here") ||
+ ParseToken(lltok::Metadata, "Expected '!' here") ||
+ ParseToken(lltok::lbrace, "Expected '{' here"))
return true;
- if (Lex.getKind() != lltok::Metadata)
- return TokError("Expected '!' here");
- Lex.Lex();
-
- if (Lex.getKind() != lltok::lbrace)
- return TokError("Expected '{' here");
- Lex.Lex();
SmallVector<MetadataBase *, 8> Elts;
do {
if (ParseToken(lltok::Metadata, "Expected '!' here"))
return true;
- Lex.Lex();
// FIXME: This rejects MDStrings. Are they legal in an named MDNode or not?
MDNode *N = 0;