1 files changed, 46 insertions, 17 deletions

diff --git a/llvm/lib/AsmParser/LLLexer.h b/llvm/lib/AsmParser/LLLexer.h
index 8b44b14cb74..45001815e75 100644
--- a/llvm/lib/AsmParser/LLLexer.h
+++ b/llvm/lib/AsmParser/LLLexer.h
@@ -14,43 +14,72 @@
 #ifndef LIB_ASMPARSER_LLLEXER_H
 #define LIB_ASMPARSER_LLLEXER_H
 
+#include "LLToken.h"
+#include "llvm/ADT/APSInt.h"
+#include "llvm/ADT/APFloat.h"
+
 #include <vector>
 #include <string>
 #include <iosfwd>
 
 namespace llvm {
   class MemoryBuffer;
+  class Type;
+  class ParseError;
   
   class LLLexer {
     const char *CurPtr;
-    unsigned CurLineNo;
     MemoryBuffer *CurBuf;
-    
+    ParseError &ErrorInfo;
+
+    // Information about the current token.
     const char *TokStart;
+    lltok::Kind CurKind;
+    std::string StrVal;
+    unsigned UIntVal;
+    const Type *TyVal;
+    APFloat APFloatVal;
+    APSInt  APSIntVal;
     
     std::string TheError;
   public:
-    explicit LLLexer(MemoryBuffer *StartBuf);
+    explicit LLLexer(MemoryBuffer *StartBuf, ParseError &);
     ~LLLexer() {}
 
-    const char *getTokStart() const { return TokStart; }
-    unsigned getTokLength() const { return CurPtr-TokStart; }
-    unsigned getLineNo() const { return CurLineNo; }
-    std::string getFilename() const;
-    int LexToken();
-    
-    const std::string getError() const { return TheError; }
+    lltok::Kind Lex() {
+      return CurKind = LexToken();
+    }
+
+    typedef const char* LocTy;
+    LocTy getLoc() const { return TokStart; }
+    lltok::Kind getKind() const { return CurKind; }
+    const std::string getStrVal() const { return StrVal; }
+    const Type *getTyVal() const { return TyVal; }
+    unsigned getUIntVal() const { return UIntVal; }
+    const APSInt &getAPSIntVal() const { return APSIntVal; }
+    const APFloat &getAPFloatVal() const { return APFloatVal; }
+
     
+    bool Error(LocTy L, const std::string &Msg) const;
+    bool Error(const std::string &Msg) const { return Error(CurPtr, Msg); }
+    std::string getFilename() const;
+        
   private:
+    lltok::Kind LexToken();
+
     int getNextChar();
     void SkipLineComment();
-    int LexIdentifier();
-    int LexDigitOrNegative();
-    int LexPositive();
-    int LexAt();
-    int LexPercent();
-    int LexQuote();
-    int Lex0x();
+    lltok::Kind LexIdentifier();
+    lltok::Kind LexDigitOrNegative();
+    lltok::Kind LexPositive();
+    lltok::Kind LexAt();
+    lltok::Kind LexPercent();
+    lltok::Kind LexQuote();
+    lltok::Kind Lex0x();
+    
+    uint64_t atoull(const char *Buffer, const char *End);
+    uint64_t HexIntToVal(const char *Buffer, const char *End);
+    void HexToIntPair(const char *Buffer, const char *End, uint64_t Pair[2]);
   };
 } // end namespace llvm