commit d217773f106856a11879ec79dc468efefaf2ee75
author Chris Lattner <sabre@nondot.org> Fri Jul 20 16:59:19 2007 +0000
committer Chris Lattner <sabre@nondot.org> Fri Jul 20 16:59:19 2007 +0000
tree b287f41254ad8f377f504fc9645404a7772084d0
parent 25bdb51276d3bfc180a68688082071505a00ed27

At one point there were going to be lexer and parser tokens.
Since that point is now long gone, we should rename LexerToken to
Token, as it is the only kind of token we have.


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@40105 91177308-0d34-0410-b5e6-96231b3b80d8

Parse/ParseExpr.cpp

diff --git a/Parse/ParseExpr.cpp b/Parse/ParseExpr.cpp
index 5862e7b..7048c83 100644
--- a/Parse/ParseExpr.cpp
+++ b/Parse/ParseExpr.cpp
@@ -195,7 +195,7 @@
 /// of part of an expression.  For example, in "A[1]+B", we consumed "A" (which
 /// is now in 'IdTok') and the current token is "[".
 Parser::ExprResult Parser::
-ParseExpressionWithLeadingIdentifier(const LexerToken &IdTok) {
+ParseExpressionWithLeadingIdentifier(const Token &IdTok) {
   // We know that 'IdTok' must correspond to this production:
   //   primary-expression: identifier
   
@@ -226,7 +226,7 @@
 /// of part of an assignment-expression.  For example, in "A[1]+B", we consumed
 /// "A" (which is now in 'IdTok') and the current token is "[".
 Parser::ExprResult Parser::
-ParseAssignmentExprWithLeadingIdentifier(const LexerToken &IdTok) {
+ParseAssignmentExprWithLeadingIdentifier(const Token &IdTok) {
   // We know that 'IdTok' must correspond to this production:
   //   primary-expression: identifier
   
@@ -258,7 +258,7 @@
 /// expression.  For example, in "*(int*)P+B", we consumed "*" (which is
 /// now in 'StarTok') and the current token is "(".
 Parser::ExprResult Parser::
-ParseAssignmentExpressionWithLeadingStar(const LexerToken &StarTok) {
+ParseAssignmentExpressionWithLeadingStar(const Token &StarTok) {
   // We know that 'StarTok' must correspond to this production:
   //  unary-expression: unary-operator cast-expression
   // where 'unary-operator' is '*'.
@@ -303,7 +303,7 @@
       return LHS;
 
     // Consume the operator, saving the operator token for error reporting.
-    LexerToken OpToken = Tok;
+    Token OpToken = Tok;
     ConsumeToken();
     
     // Special case handling for the ternary operator.
@@ -696,7 +696,7 @@
   assert((Tok.getKind() == tok::kw_sizeof ||
           Tok.getKind() == tok::kw___alignof) &&
          "Not a sizeof/alignof expression!");
-  LexerToken OpTok = Tok;
+  Token OpTok = Tok;
   ConsumeToken();
   
   // If the operand doesn't start with an '(', it must be an expression.
@@ -924,7 +924,7 @@
   
   // String concat.  Note that keywords like __func__ and __FUNCTION__ are not
   // considered to be strings for concatenation purposes.
-  llvm::SmallVector<LexerToken, 4> StringToks;
+  llvm::SmallVector<Token, 4> StringToks;
   
   do {
     StringToks.push_back(Tok);