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

Driver/DiagChecker.cpp

diff --git a/Driver/DiagChecker.cpp b/Driver/DiagChecker.cpp
index 9830c0d..279b55b 100644
--- a/Driver/DiagChecker.cpp
+++ b/Driver/DiagChecker.cpp
@@ -91,7 +91,7 @@
   // Enter the cave.
   PP.EnterSourceFile(MainFileID, 0, true);
 
-  LexerToken Tok;
+  Token Tok;
   do {
     PP.Lex(Tok);
 

Driver/PrintPreprocessedOutput.cpp

diff --git a/Driver/PrintPreprocessedOutput.cpp b/Driver/PrintPreprocessedOutput.cpp
index c221673..46278f1 100644
--- a/Driver/PrintPreprocessedOutput.cpp
+++ b/Driver/PrintPreprocessedOutput.cpp
@@ -128,9 +128,9 @@
   virtual void Ident(SourceLocation Loc, const std::string &str);
   
 
-  void HandleFirstTokOnLine(LexerToken &Tok);
+  void HandleFirstTokOnLine(Token &Tok);
   void MoveToLine(SourceLocation Loc);
-  bool AvoidConcat(const LexerToken &PrevTok, const LexerToken &Tok);
+  bool AvoidConcat(const Token &PrevTok, const Token &Tok);
 };
 }
 
@@ -250,7 +250,7 @@
 
 /// HandleFirstTokOnLine - When emitting a preprocessed file in -E mode, this
 /// is called for the first token on each new line.
-void PrintPPOutputPPCallbacks::HandleFirstTokOnLine(LexerToken &Tok) {
+void PrintPPOutputPPCallbacks::HandleFirstTokOnLine(Token &Tok) {
   // Figure out what line we went to and insert the appropriate number of
   // newline characters.
   MoveToLine(Tok.getLocation());
@@ -281,7 +281,7 @@
   
   UnknownPragmaHandler(const char *prefix, PrintPPOutputPPCallbacks *callbacks)
     : PragmaHandler(0), Prefix(prefix), Callbacks(callbacks) {}
-  virtual void HandlePragma(Preprocessor &PP, LexerToken &PragmaTok) {
+  virtual void HandlePragma(Preprocessor &PP, Token &PragmaTok) {
     // Figure out what line we went to and insert the appropriate number of
     // newline characters.
     Callbacks->MoveToLine(PragmaTok.getLocation());
@@ -311,8 +311,8 @@
 /// the resulting output won't have incorrect concatenations going on.  Examples
 /// include "..", which we print with a space between, because we don't want to
 /// track enough to tell "x.." from "...".
-bool PrintPPOutputPPCallbacks::AvoidConcat(const LexerToken &PrevTok,
-                                           const LexerToken &Tok) {
+bool PrintPPOutputPPCallbacks::AvoidConcat(const Token &PrevTok,
+                                           const Token &Tok) {
   char Buffer[256];
   
   // If we haven't emitted a token on this line yet, PrevTok isn't useful to
@@ -394,7 +394,7 @@
   
   InitOutputBuffer();
   
-  LexerToken Tok, PrevTok;
+  Token Tok, PrevTok;
   char Buffer[256];
   PrintPPOutputPPCallbacks *Callbacks = new PrintPPOutputPPCallbacks(PP);
   PP.setPPCallbacks(Callbacks);

Driver/TextDiagnosticPrinter.cpp

diff --git a/Driver/TextDiagnosticPrinter.cpp b/Driver/TextDiagnosticPrinter.cpp
index 87f3374..ac48e25 100644
--- a/Driver/TextDiagnosticPrinter.cpp
+++ b/Driver/TextDiagnosticPrinter.cpp
@@ -111,7 +111,7 @@
   
   // Create a lexer starting at the beginning of this token.
   Lexer TheLexer(Loc, *ThePreprocessor, StrData);
-  LexerToken TheTok;
+  Token TheTok;
   TheLexer.LexRawToken(TheTok);
   return TheTok.getLength();
 }

Driver/clang.cpp

diff --git a/Driver/clang.cpp b/Driver/clang.cpp
index 404baad..ac12ef7 100644
--- a/Driver/clang.cpp
+++ b/Driver/clang.cpp
@@ -754,7 +754,7 @@
   PP.EnterSourceFile(FileID, 0);
 
   // Lex the file, which will read all the macros.
-  LexerToken Tok;
+  Token Tok;
   PP.Lex(Tok);
   assert(Tok.getKind() == tok::eof && "Didn't read entire file!");
 
@@ -775,7 +775,7 @@
     fprintf(stderr, "Unexpected program action!\n");
     return;
   case DumpTokens: {                 // Token dump mode.
-    LexerToken Tok;
+    Token Tok;
     // Start parsing the specified input file.
     PP.EnterSourceFile(MainFileID, 0, true);
     do {
@@ -786,7 +786,7 @@
     break;
   }
   case RunPreprocessorOnly: {        // Just lex as fast as we can, no output.
-    LexerToken Tok;
+    Token Tok;
     // Start parsing the specified input file.
     PP.EnterSourceFile(MainFileID, 0, true);
     do {