[llvm-commits] [llvm] r92294 - in /llvm/trunk/lib/AsmParser: LLLexer.cpp LLLexer.h LLParser.cpp LLToken.h
Chris Lattner
sabre at nondot.org
Tue Dec 29 20:56:59 PST 2009
Author: lattner
Date: Tue Dec 29 22:56:59 2009
New Revision: 92294
URL: http://llvm.org/viewvc/llvm-project?rev=92294&view=rev
Log:
rename lltok::Metadata -> lltok::exclaim. We name tokens
after their syntactic form, not their semantic form.
Modified:
llvm/trunk/lib/AsmParser/LLLexer.cpp
llvm/trunk/lib/AsmParser/LLLexer.h
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=92294&r1=92293&r2=92294&view=diff
==============================================================================
--- llvm/trunk/lib/AsmParser/LLLexer.cpp (original)
+++ llvm/trunk/lib/AsmParser/LLLexer.cpp Tue Dec 29 22:56:59 2009
@@ -254,7 +254,7 @@
case ';':
SkipLineComment();
return LexToken();
- case '!': return LexMetadata();
+ case '!': return LexExclaim();
case '0': case '1': case '2': case '3': case '4':
case '5': case '6': case '7': case '8': case '9':
case '-':
@@ -422,11 +422,11 @@
return false;
}
-/// LexMetadata:
+/// LexExclaim:
/// !{...}
/// !42
/// !foo
-lltok::Kind LLLexer::LexMetadata() {
+lltok::Kind LLLexer::LexExclaim() {
if (isalpha(CurPtr[0])) {
++CurPtr;
while (isalnum(CurPtr[0]) || CurPtr[0] == '-' || CurPtr[0] == '$' ||
@@ -436,7 +436,7 @@
StrVal.assign(TokStart+1, CurPtr); // Skip !
return lltok::NamedOrCustomMD;
}
- return lltok::Metadata;
+ return lltok::exclaim;
}
/// LexIdentifier: Handle several related productions:
Modified: llvm/trunk/lib/AsmParser/LLLexer.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/AsmParser/LLLexer.h?rev=92294&r1=92293&r2=92294&view=diff
==============================================================================
--- llvm/trunk/lib/AsmParser/LLLexer.h (original)
+++ llvm/trunk/lib/AsmParser/LLLexer.h Tue Dec 29 22:56:59 2009
@@ -75,7 +75,7 @@
lltok::Kind LexDigitOrNegative();
lltok::Kind LexPositive();
lltok::Kind LexAt();
- lltok::Kind LexMetadata();
+ lltok::Kind LexExclaim();
lltok::Kind LexPercent();
lltok::Kind LexQuote();
lltok::Kind Lex0x();
Modified: llvm/trunk/lib/AsmParser/LLParser.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/AsmParser/LLParser.cpp?rev=92294&r1=92293&r2=92294&view=diff
==============================================================================
--- llvm/trunk/lib/AsmParser/LLParser.cpp (original)
+++ llvm/trunk/lib/AsmParser/LLParser.cpp Tue Dec 29 22:56:59 2009
@@ -168,7 +168,7 @@
case lltok::LocalVar: if (ParseNamedType()) return true; break;
case lltok::GlobalID: if (ParseUnnamedGlobal()) return true; break;
case lltok::GlobalVar: if (ParseNamedGlobal()) return true; break;
- case lltok::Metadata: if (ParseStandaloneMetadata()) return true; break;
+ case lltok::exclaim: if (ParseStandaloneMetadata()) return true; break;
case lltok::NamedOrCustomMD: if (ParseNamedMetadata()) return true; break;
// The Global variable production with no name can have many different
@@ -506,13 +506,13 @@
std::string Name = Lex.getStrVal();
if (ParseToken(lltok::equal, "expected '=' here") ||
- ParseToken(lltok::Metadata, "Expected '!' here") ||
+ ParseToken(lltok::exclaim, "Expected '!' here") ||
ParseToken(lltok::lbrace, "Expected '{' here"))
return true;
SmallVector<MetadataBase *, 8> Elts;
do {
- if (ParseToken(lltok::Metadata, "Expected '!' here"))
+ if (ParseToken(lltok::exclaim, "Expected '!' here"))
return true;
// FIXME: This rejects MDStrings. Are they legal in an named MDNode or not?
@@ -531,7 +531,7 @@
/// ParseStandaloneMetadata:
/// !42 = !{...}
bool LLParser::ParseStandaloneMetadata() {
- assert(Lex.getKind() == lltok::Metadata);
+ assert(Lex.getKind() == lltok::exclaim);
Lex.Lex();
unsigned MetadataID = 0;
@@ -542,7 +542,7 @@
if (ParseUInt32(MetadataID) ||
ParseToken(lltok::equal, "expected '=' here") ||
ParseType(Ty, TyLoc) ||
- ParseToken(lltok::Metadata, "Expected metadata here") ||
+ ParseToken(lltok::exclaim, "Expected '!' here") ||
ParseToken(lltok::lbrace, "Expected '{' here") ||
ParseMDNodeVector(Elts) ||
ParseToken(lltok::rbrace, "expected end of metadata node"))
@@ -1074,12 +1074,10 @@
std::string Name = Lex.getStrVal();
Lex.Lex();
- if (Lex.getKind() != lltok::Metadata)
- return TokError("expected '!' here");
- Lex.Lex();
-
MDNode *Node;
- if (ParseMDNodeID(Node)) return true;
+ if (ParseToken(lltok::exclaim, "expected '!' here") ||
+ ParseMDNodeID(Node))
+ return true;
unsigned MDK = M->getMDKindID(Name.c_str());
MDsOnInst.push_back(std::make_pair(MDK, Node));
@@ -1890,7 +1888,7 @@
ID.StrVal = Lex.getStrVal();
ID.Kind = ValID::t_LocalName;
break;
- case lltok::Metadata: // !{...} MDNode, !"foo" MDString
+ case lltok::exclaim: // !{...} MDNode, !"foo" MDString
Lex.Lex();
// FIXME: This doesn't belong here.
Modified: llvm/trunk/lib/AsmParser/LLToken.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/AsmParser/LLToken.h?rev=92294&r1=92293&r2=92294&view=diff
==============================================================================
--- llvm/trunk/lib/AsmParser/LLToken.h (original)
+++ llvm/trunk/lib/AsmParser/LLToken.h Tue Dec 29 22:56:59 2009
@@ -29,6 +29,7 @@
less, greater, // < >
lparen, rparen, // ( )
backslash, // \ (not /)
+ exclaim, // !
kw_x,
kw_begin, kw_end,
@@ -131,9 +132,6 @@
StringConstant, // "foo"
NamedOrCustomMD, // !foo
- // Metadata valued tokens.
- Metadata, // !"foo" !{i8 42}
-
// Type valued tokens (TyVal).
Type,
More information about the llvm-commits
mailing list