[llvm-commits] [llvm] r92295 - in /llvm/trunk/lib/AsmParser: LLLexer.cpp LLParser.cpp LLToken.h
Chris Lattner
sabre at nondot.org
Tue Dec 29 21:02:06 PST 2009
Author: lattner
Date: Tue Dec 29 23:02:06 2009
New Revision: 92295
URL: http://llvm.org/viewvc/llvm-project?rev=92295&view=rev
Log:
rename NamedOrCustomMD -> MetadataVar to follow conventions of all the rest of the code.
Modified:
llvm/trunk/lib/AsmParser/LLLexer.cpp
llvm/trunk/lib/AsmParser/LLParser.cpp
llvm/trunk/lib/AsmParser/LLToken.h
Modified: llvm/trunk/lib/AsmParser/LLLexer.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/AsmParser/LLLexer.cpp?rev=92295&r1=92294&r2=92295&view=diff
==============================================================================
--- llvm/trunk/lib/AsmParser/LLLexer.cpp (original)
+++ llvm/trunk/lib/AsmParser/LLLexer.cpp Tue Dec 29 23:02:06 2009
@@ -423,10 +423,10 @@
}
/// LexExclaim:
-/// !{...}
-/// !42
/// !foo
+/// !
lltok::Kind LLLexer::LexExclaim() {
+ // Lex a metadata name as a MetadataVar.
if (isalpha(CurPtr[0])) {
++CurPtr;
while (isalnum(CurPtr[0]) || CurPtr[0] == '-' || CurPtr[0] == '$' ||
@@ -434,7 +434,7 @@
++CurPtr;
StrVal.assign(TokStart+1, CurPtr); // Skip !
- return lltok::NamedOrCustomMD;
+ return lltok::MetadataVar;
}
return lltok::exclaim;
}
Modified: llvm/trunk/lib/AsmParser/LLParser.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/AsmParser/LLParser.cpp?rev=92295&r1=92294&r2=92295&view=diff
==============================================================================
--- llvm/trunk/lib/AsmParser/LLParser.cpp (original)
+++ llvm/trunk/lib/AsmParser/LLParser.cpp Tue Dec 29 23:02:06 2009
@@ -169,7 +169,7 @@
case lltok::GlobalID: if (ParseUnnamedGlobal()) return true; break;
case lltok::GlobalVar: if (ParseNamedGlobal()) return true; break;
case lltok::exclaim: if (ParseStandaloneMetadata()) return true; break;
- case lltok::NamedOrCustomMD: if (ParseNamedMetadata()) return true; break;
+ case lltok::MetadataVar: if (ParseNamedMetadata()) return true; break;
// The Global variable production with no name can have many different
// optional leading prefixes, the production is:
@@ -501,9 +501,9 @@
/// ParseNamedMetadata:
/// !foo = !{ !1, !2 }
bool LLParser::ParseNamedMetadata() {
- assert(Lex.getKind() == lltok::NamedOrCustomMD);
- Lex.Lex();
+ assert(Lex.getKind() == lltok::MetadataVar);
std::string Name = Lex.getStrVal();
+ Lex.Lex();
if (ParseToken(lltok::equal, "expected '=' here") ||
ParseToken(lltok::exclaim, "Expected '!' here") ||
@@ -1067,7 +1067,7 @@
/// ::= /* empty */
/// ::= !dbg !42 (',' !dbg !57)*
bool LLParser::ParseOptionalCustomMetadata() {
- if (Lex.getKind() != lltok::NamedOrCustomMD)
+ if (Lex.getKind() != lltok::MetadataVar)
return false;
while (1) {
@@ -1087,7 +1087,7 @@
return false;
// The next value must be a custom metadata id.
- if (Lex.getKind() != lltok::NamedOrCustomMD)
+ if (Lex.getKind() != lltok::MetadataVar)
return TokError("expected more custom metadata ids");
}
}
@@ -1112,7 +1112,7 @@
// FIXME: Handle customized metadata info attached with an instruction.
do {
- if (Lex.getKind() == lltok::NamedOrCustomMD) {
+ if (Lex.getKind() == lltok::MetadataVar) {
if (ParseOptionalCustomMetadata()) return true;
} else if (Lex.getKind() == lltok::kw_align) {
if (ParseOptionalAlignment(Alignment)) return true;
@@ -1131,7 +1131,8 @@
return TokError("expected ',' as start of index list");
while (EatIfPresent(lltok::comma)) {
- if (Lex.getKind() == lltok::NamedOrCustomMD)
+ // FIXME: TERRIBLE HACK. Loses comma state.
+ if (Lex.getKind() == lltok::MetadataVar)
break;
unsigned Idx;
if (ParseUInt32(Idx)) return true;
@@ -2115,7 +2116,8 @@
ParseIndexList(Indices) ||
ParseToken(lltok::rparen, "expected ')' in extractvalue constantexpr"))
return true;
- if (Lex.getKind() == lltok::NamedOrCustomMD)
+ // FIXME: THIS ISN'T RIGHT? WHERE IS THE COMMA?
+ if (Lex.getKind() == lltok::MetadataVar)
if (ParseOptionalCustomMetadata()) return true;
if (!isa<StructType>(Val->getType()) && !isa<ArrayType>(Val->getType()))
@@ -2139,7 +2141,7 @@
ParseIndexList(Indices) ||
ParseToken(lltok::rparen, "expected ')' in insertvalue constantexpr"))
return true;
- if (Lex.getKind() == lltok::NamedOrCustomMD)
+ if (Lex.getKind() == lltok::MetadataVar)
if (ParseOptionalCustomMetadata()) return true;
if (!isa<StructType>(Val0->getType()) && !isa<ArrayType>(Val0->getType()))
return Error(ID.Loc, "extractvalue operand must be array or struct");
@@ -3014,7 +3016,7 @@
if (EatIfPresent(lltok::comma)) {
// Parse optional custom metadata, e.g. !dbg
- if (Lex.getKind() == lltok::NamedOrCustomMD) {
+ if (Lex.getKind() == lltok::MetadataVar) {
if (ParseOptionalCustomMetadata()) return true;
} else {
// The normal case is one return value.
@@ -3026,7 +3028,7 @@
do {
// If optional custom metadata, e.g. !dbg is seen then this is the
// end of MRV.
- if (Lex.getKind() == lltok::NamedOrCustomMD)
+ if (Lex.getKind() == lltok::MetadataVar)
break;
if (ParseTypeAndValue(RV, PFS)) return true;
RVs.push_back(RV);
@@ -3485,7 +3487,7 @@
if (!EatIfPresent(lltok::comma))
break;
- if (Lex.getKind() == lltok::NamedOrCustomMD)
+ if (Lex.getKind() == lltok::MetadataVar)
break;
if (ParseToken(lltok::lsquare, "expected '[' in phi value list") ||
@@ -3496,7 +3498,7 @@
return true;
}
- if (Lex.getKind() == lltok::NamedOrCustomMD)
+ if (Lex.getKind() == lltok::MetadataVar)
if (ParseOptionalCustomMetadata()) return true;
if (!Ty->isFirstClassType())
@@ -3624,7 +3626,7 @@
if (EatIfPresent(lltok::comma)) {
if (Lex.getKind() == lltok::kw_align
- || Lex.getKind() == lltok::NamedOrCustomMD) {
+ || Lex.getKind() == lltok::MetadataVar) {
if (ParseOptionalInfo(Alignment)) return true;
} else {
if (ParseTypeAndValue(Size, SizeLoc, PFS)) return true;
@@ -3744,14 +3746,14 @@
SmallVector<Value*, 16> Indices;
while (EatIfPresent(lltok::comma)) {
- if (Lex.getKind() == lltok::NamedOrCustomMD)
+ if (Lex.getKind() == lltok::MetadataVar)
break;
if (ParseTypeAndValue(Val, EltLoc, PFS)) return true;
if (!isa<IntegerType>(Val->getType()))
return Error(EltLoc, "getelementptr index must be an integer");
Indices.push_back(Val);
}
- if (Lex.getKind() == lltok::NamedOrCustomMD)
+ if (Lex.getKind() == lltok::MetadataVar)
if (ParseOptionalCustomMetadata()) return true;
if (!GetElementPtrInst::getIndexedType(Ptr->getType(),
@@ -3771,7 +3773,7 @@
if (ParseTypeAndValue(Val, Loc, PFS) ||
ParseIndexList(Indices))
return true;
- if (Lex.getKind() == lltok::NamedOrCustomMD)
+ if (Lex.getKind() == lltok::MetadataVar)
if (ParseOptionalCustomMetadata()) return true;
if (!isa<StructType>(Val->getType()) && !isa<ArrayType>(Val->getType()))
@@ -3794,7 +3796,7 @@
ParseTypeAndValue(Val1, Loc1, PFS) ||
ParseIndexList(Indices))
return true;
- if (Lex.getKind() == lltok::NamedOrCustomMD)
+ if (Lex.getKind() == lltok::MetadataVar)
if (ParseOptionalCustomMetadata()) return true;
if (!isa<StructType>(Val0->getType()) && !isa<ArrayType>(Val0->getType()))
Modified: llvm/trunk/lib/AsmParser/LLToken.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/AsmParser/LLToken.h?rev=92295&r1=92294&r2=92295&view=diff
==============================================================================
--- llvm/trunk/lib/AsmParser/LLToken.h (original)
+++ llvm/trunk/lib/AsmParser/LLToken.h Tue Dec 29 23:02:06 2009
@@ -129,8 +129,8 @@
LabelStr, // foo:
GlobalVar, // @foo @"foo"
LocalVar, // %foo %"foo"
+ MetadataVar, // !foo
StringConstant, // "foo"
- NamedOrCustomMD, // !foo
// Type valued tokens (TyVal).
Type,
More information about the llvm-commits
mailing list