[PATCH] D14252: [AsmParser] Allow tokens to be put back in to the token stream.

[Colin LeMahieu via llvm-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rL252432: [AsmParser] Allow tokens to be put back in to the token stream. (authored by colinl).

Changed prior to commit:
  http://reviews.llvm.org/D14252?vs=38959&id=39656#toc

Repository:
  rL LLVM

http://reviews.llvm.org/D14252

Files:
  llvm/trunk/include/llvm/MC/MCParser/MCAsmLexer.h
  llvm/trunk/lib/MC/MCParser/MCAsmLexer.cpp

Index: llvm/trunk/include/llvm/MC/MCParser/MCAsmLexer.h
===================================================================
--- llvm/trunk/include/llvm/MC/MCParser/MCAsmLexer.h
+++ llvm/trunk/include/llvm/MC/MCParser/MCAsmLexer.h
@@ -118,7 +118,7 @@
 /// lexers.
 class MCAsmLexer {
   /// The current token, stored in the base class for faster access.
-  AsmToken CurTok;
+  SmallVector<AsmToken, 1> CurTok;
 
   /// The location and description of the current error
   SMLoc ErrLoc;
@@ -148,7 +148,15 @@
   /// The lexer will continuosly return the end-of-file token once the end of
   /// the main input file has been reached.
   const AsmToken &Lex() {
-    return CurTok = LexToken();
+    assert(!CurTok.empty());
+    CurTok.erase(CurTok.begin());
+    if (CurTok.empty())
+      CurTok.emplace_back(LexToken());
+    return CurTok.front();
+  }
+
+  void UnLex(AsmToken const &Token) {
+    CurTok.insert(CurTok.begin(), Token);
   }
 
   virtual StringRef LexUntilEndOfStatement() = 0;
@@ -158,7 +166,7 @@
 
   /// Get the current (last) lexed token.
   const AsmToken &getTok() const {
-    return CurTok;
+    return CurTok[0];
   }
 
   /// Look ahead at the next token to be lexed.
Index: llvm/trunk/lib/MC/MCParser/MCAsmLexer.cpp
===================================================================
--- llvm/trunk/lib/MC/MCParser/MCAsmLexer.cpp
+++ llvm/trunk/lib/MC/MCParser/MCAsmLexer.cpp
@@ -12,8 +12,8 @@
 
 using namespace llvm;
 
-MCAsmLexer::MCAsmLexer() : CurTok(AsmToken::Error, StringRef()),
-                           TokStart(nullptr), SkipSpace(true) {
+MCAsmLexer::MCAsmLexer() : TokStart(nullptr), SkipSpace(true) {
+  CurTok.emplace_back(AsmToken::Error, StringRef());
 }
 
 MCAsmLexer::~MCAsmLexer() {


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D14252.39656.patch
Type: text/x-patch
Size: 1733 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20151108/bb55f19f/attachment.bin>