X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=lib%2FAsmParser%2FLLLexer.h;h=ad11d49b259408d02407392677845c99dd27b3fc;hb=07f96126af8dc4b6a2081d55ebcca2d113528cf3;hp=8b44b14cb741e9b14474772c3db420a7598f7bb6;hpb=950a4c40b823cd4f09dc71be635229246dfd6cac;p=oota-llvm.git

diff --git a/lib/AsmParser/LLLexer.h b/lib/AsmParser/LLLexer.h
index 8b44b14cb74..ad11d49b259 100644
--- a/lib/AsmParser/LLLexer.h
+++ b/lib/AsmParser/LLLexer.h
@@ -14,43 +14,83 @@
 #ifndef LIB_ASMPARSER_LLLEXER_H
 #define LIB_ASMPARSER_LLLEXER_H
 
-#include <vector>
+#include "LLToken.h"
+#include "llvm/ADT/APFloat.h"
+#include "llvm/ADT/APSInt.h"
+#include "llvm/Support/SourceMgr.h"
 #include <string>
-#include <iosfwd>
 
 namespace llvm {
   class MemoryBuffer;
-  
+  class Type;
+  class SMDiagnostic;
+  class LLVMContext;
+
   class LLLexer {
     const char *CurPtr;
-    unsigned CurLineNo;
     MemoryBuffer *CurBuf;
-    
+    SMDiagnostic &ErrorInfo;
+    SourceMgr &SM;
+    LLVMContext &Context;
+
+    // Information about the current token.
     const char *TokStart;
-    
-    std::string TheError;
+    lltok::Kind CurKind;
+    std::string StrVal;
+    unsigned UIntVal;
+    Type *TyVal;
+    APFloat APFloatVal;
+    APSInt  APSIntVal;
+
   public:
-    explicit LLLexer(MemoryBuffer *StartBuf);
+    explicit LLLexer(MemoryBuffer *StartBuf, SourceMgr &SM, SMDiagnostic &,
+                     LLVMContext &C);
     ~LLLexer() {}
 
-    const char *getTokStart() const { return TokStart; }
-    unsigned getTokLength() const { return CurPtr-TokStart; }
-    unsigned getLineNo() const { return CurLineNo; }
+    lltok::Kind Lex() {
+      return CurKind = LexToken();
+    }
+
+    typedef SMLoc LocTy;
+    LocTy getLoc() const { return SMLoc::getFromPointer(TokStart); }
+    lltok::Kind getKind() const { return CurKind; }
+    const std::string &getStrVal() const { return StrVal; }
+    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 Twine &Msg) const;
+    bool Error(const Twine &Msg) const { return Error(getLoc(), Msg); }
+
+    void Warning(LocTy WarningLoc, const Twine &Msg) const;
+    void Warning(const Twine &Msg) const { return Warning(getLoc(), Msg); }
+
     std::string getFilename() const;
-    int LexToken();
-    
-    const std::string getError() const { return TheError; }
-    
+
   private:
+    lltok::Kind LexToken();
+
     int getNextChar();
     void SkipLineComment();
-    int LexIdentifier();
-    int LexDigitOrNegative();
-    int LexPositive();
-    int LexAt();
-    int LexPercent();
-    int LexQuote();
-    int Lex0x();
+    lltok::Kind ReadString(lltok::Kind kind);
+    bool ReadVarName();
+
+    lltok::Kind LexIdentifier();
+    lltok::Kind LexDigitOrNegative();
+    lltok::Kind LexPositive();
+    lltok::Kind LexAt();
+    lltok::Kind LexExclaim();
+    lltok::Kind LexPercent();
+    lltok::Kind LexQuote();
+    lltok::Kind Lex0x();
+    lltok::Kind LexHash();
+
+    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]);
+    void FP80HexToIntPair(const char *Buff, const char *End, uint64_t Pair[2]);
   };
 } // end namespace llvm