Drop some AsmLexer methods in favor of their AsmToken equivalents.

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

diff --git a/tools/llvm-mc/AsmLexer.cpp b/tools/llvm-mc/AsmLexer.cpp
index de583ffa8cc75f804ad603e85f107de116d39aac..09fb34d6d9b2413ec856e15b741c040ad0a77b98 100644 (file)
--- a/tools/llvm-mc/AsmLexer.cpp
+++ b/tools/llvm-mc/AsmLexer.cpp
@@ -35,6 +35,10 @@ SMLoc AsmLexer::getLoc() const {
   return SMLoc::getFromPointer(TokStart);
 }
 
+SMLoc AsmToken::getLoc() const {
+  return SMLoc::getFromPointer(Str.data());
+}
+
 void AsmLexer::PrintMessage(SMLoc Loc, const std::string &Msg, 
                             const char *Type) const {
   SrcMgr.PrintMessage(Loc, Msg, Type);

diff --git a/tools/llvm-mc/AsmLexer.h b/tools/llvm-mc/AsmLexer.h
index 6146499e16c514706885bdb27116146549470568..3bedc6e8e77f4c72190484e2afa5a721dd986859 100644 (file)
--- a/tools/llvm-mc/AsmLexer.h
+++ b/tools/llvm-mc/AsmLexer.h
@@ -72,6 +72,11 @@ public:
 
   SMLoc getLoc() const;
 
+  /// getString - Get the string for the current token, this includes all
+  /// characters (for example, the quotes on strings) in the token.
+  ///
+  /// The returned StringRef points into the source manager's memory buffer, and
+  /// is safe to store across calls to Lex().
   StringRef getString() const { return Str; }
 
   // FIXME: Don't compute this in advance, it makes every token larger, and is
@@ -113,21 +118,10 @@ public:
   bool is(AsmToken::TokenKind K) const { return CurTok.is(K); }
   bool isNot(AsmToken::TokenKind K) const { return CurTok.isNot(K); }
 
-  /// getCurStrVal - Get the string for the current token, this includes all
-  /// characters (for example, the quotes on strings) in the token.
-  ///
-  /// The returned StringRef points into the source manager's memory buffer, and
-  /// is safe to store across calls to Lex().
-  StringRef getCurStrVal() const {
-    return CurTok.getString();
-  }
-  int64_t getCurIntVal() const {
-    return CurTok.getIntVal();
-  }
-  
   SMLoc getLoc() const;
-
-  const AsmToken &getTok() const;
+  
+  /// getTok - Return a reference to the current (last) lexed token.
+  const AsmToken &getTok() const { return CurTok; }
   
   /// EnterIncludeFile - Enter the specified file. This returns true on failure.
   bool EnterIncludeFile(const std::string &Filename);

diff --git a/tools/llvm-mc/AsmParser.cpp b/tools/llvm-mc/AsmParser.cpp
index 4af4bd232a0c0b1b351bfc5a0dd108fba4a90af9..602d696ac794f7eecfe112a46d30a5cc817819df 100644 (file)
--- a/tools/llvm-mc/AsmParser.cpp
+++ b/tools/llvm-mc/AsmParser.cpp
@@ -99,7 +99,7 @@ bool AsmParser::ParsePrimaryExpr(AsmExpr *&Res) {
   case AsmToken::Identifier: {
     // This is a label, this should be parsed as part of an expression, to
     // handle things like LFOO+4.
-    MCSymbol *Sym = Ctx.GetOrCreateSymbol(Lexer.getCurStrVal());
+    MCSymbol *Sym = Ctx.GetOrCreateSymbol(Lexer.getTok().getString());
 
     // If this is use of an undefined symbol then mark it external.
     if (!Sym->getSection() && !Ctx.GetSymbolValue(Sym))
@@ -110,7 +110,7 @@ bool AsmParser::ParsePrimaryExpr(AsmExpr *&Res) {
     return false;
   }
   case AsmToken::Integer:
-    Res = new AsmConstantExpr(Lexer.getCurIntVal());
+    Res = new AsmConstantExpr(Lexer.getTok().getIntVal());
     Lexer.Lex(); // Eat identifier.
     return false;
   case AsmToken::LParen:
@@ -313,8 +313,9 @@ bool AsmParser::ParseStatement() {
   }
   
   // If we have an identifier, handle it as the key symbol.
-  SMLoc IDLoc = Lexer.getLoc();
-  StringRef IDVal = Lexer.getCurStrVal();
+  AsmToken ID = Lexer.getTok();
+  SMLoc IDLoc = ID.getLoc();
+  StringRef IDVal = ID.getString();
   
   // Consume the identifier, see what is after it.
   switch (Lexer.Lex()) {
@@ -606,7 +607,7 @@ bool AsmParser::ParseDirectiveSet() {
   if (Lexer.isNot(AsmToken::Identifier))
     return TokError("expected identifier after '.set' directive");
 
-  StringRef Name = Lexer.getCurStrVal();
+  StringRef Name = Lexer.getTok().getString();
   
   if (Lexer.Lex() != AsmToken::Comma)
     return TokError("unexpected token in '.set'");
@@ -623,7 +624,7 @@ bool AsmParser::ParseDirectiveDarwinSection() {
   if (Lexer.isNot(AsmToken::Identifier))
     return TokError("expected identifier after '.section' directive");
   
-  std::string Section = Lexer.getCurStrVal();
+  std::string Section = Lexer.getTok().getString();
   Lexer.Lex();
   
   // Accept a comma separated list of modifiers.
@@ -633,7 +634,7 @@ bool AsmParser::ParseDirectiveDarwinSection() {
     if (Lexer.isNot(AsmToken::Identifier))
       return TokError("expected identifier in '.section' directive");
     Section += ',';
-    Section += Lexer.getCurStrVal().str();
+    Section += Lexer.getTok().getString().str();
     Lexer.Lex();
   }
   
@@ -672,7 +673,7 @@ bool AsmParser::ParseDirectiveAscii(bool ZeroTerminated) {
       // FIXME: This shouldn't use a const char* + strlen, the string could have
       // embedded nulls.
       // FIXME: Should have accessor for getting string contents.
-      StringRef Str = Lexer.getCurStrVal();
+      StringRef Str = Lexer.getTok().getString();
       Out.EmitBytes(Str.substr(1, Str.size() - 2));
       if (ZeroTerminated)
         Out.EmitBytes(StringRef("\0", 1));
@@ -900,7 +901,7 @@ bool AsmParser::ParseDirectiveSymbolAttribute(MCStreamer::SymbolAttr Attr) {
       if (Lexer.isNot(AsmToken::Identifier))
         return TokError("expected identifier in directive");
       
-      MCSymbol *Sym = Ctx.GetOrCreateSymbol(Lexer.getCurStrVal());
+      MCSymbol *Sym = Ctx.GetOrCreateSymbol(Lexer.getTok().getString());
       Lexer.Lex();
 
       // If this is use of an undefined symbol then mark it external.
@@ -930,7 +931,7 @@ bool AsmParser::ParseDirectiveDarwinSymbolDesc() {
   
   // handle the identifier as the key symbol.
   SMLoc IDLoc = Lexer.getLoc();
-  MCSymbol *Sym = Ctx.GetOrCreateSymbol(Lexer.getCurStrVal());
+  MCSymbol *Sym = Ctx.GetOrCreateSymbol(Lexer.getTok().getString());
   Lexer.Lex();
 
   if (Lexer.isNot(AsmToken::Comma))
@@ -961,7 +962,7 @@ bool AsmParser::ParseDirectiveComm(bool IsLocal) {
   
   // handle the identifier as the key symbol.
   SMLoc IDLoc = Lexer.getLoc();
-  MCSymbol *Sym = Ctx.GetOrCreateSymbol(Lexer.getCurStrVal());
+  MCSymbol *Sym = Ctx.GetOrCreateSymbol(Lexer.getTok().getString());
   Lexer.Lex();
 
   if (Lexer.isNot(AsmToken::Comma))
@@ -1016,7 +1017,7 @@ bool AsmParser::ParseDirectiveComm(bool IsLocal) {
 bool AsmParser::ParseDirectiveDarwinZerofill() {
   if (Lexer.isNot(AsmToken::Identifier))
     return TokError("expected segment name after '.zerofill' directive");
-  std::string Section = Lexer.getCurStrVal();
+  std::string Section = Lexer.getTok().getString();
   Lexer.Lex();
 
   if (Lexer.isNot(AsmToken::Comma))
@@ -1027,7 +1028,7 @@ bool AsmParser::ParseDirectiveDarwinZerofill() {
   if (Lexer.isNot(AsmToken::Identifier))
     return TokError("expected section name after comma in '.zerofill' "
                     "directive");
-  Section += Lexer.getCurStrVal().str();
+  Section += Lexer.getTok().getString().str();
   Lexer.Lex();
 
   // FIXME: we will need to tell GetSection() that this is to be created with or
@@ -1055,7 +1056,7 @@ bool AsmParser::ParseDirectiveDarwinZerofill() {
   
   // handle the identifier as the key symbol.
   SMLoc IDLoc = Lexer.getLoc();
-  MCSymbol *Sym = Ctx.GetOrCreateSymbol(Lexer.getCurStrVal());
+  MCSymbol *Sym = Ctx.GetOrCreateSymbol(Lexer.getTok().getString());
   Lexer.Lex();
 
   if (Lexer.isNot(AsmToken::Comma))
@@ -1126,7 +1127,7 @@ bool AsmParser::ParseDirectiveAbort() {
     if (Lexer.isNot(AsmToken::String))
       return TokError("expected string in '.abort' directive");
     
-    Str = Lexer.getCurStrVal();
+    Str = Lexer.getTok().getString();
 
     Lexer.Lex();
   }
@@ -1153,7 +1154,7 @@ bool AsmParser::ParseDirectiveDarwinLsym() {
   
   // handle the identifier as the key symbol.
   SMLoc IDLoc = Lexer.getLoc();
-  MCSymbol *Sym = Ctx.GetOrCreateSymbol(Lexer.getCurStrVal());
+  MCSymbol *Sym = Ctx.GetOrCreateSymbol(Lexer.getTok().getString());
   Lexer.Lex();
 
   if (Lexer.isNot(AsmToken::Comma))
@@ -1181,7 +1182,7 @@ bool AsmParser::ParseDirectiveInclude() {
   if (Lexer.isNot(AsmToken::String))
     return TokError("expected string in '.include' directive");
   
-  std::string Filename = Lexer.getCurStrVal();
+  std::string Filename = Lexer.getTok().getString();
   SMLoc IncludeLoc = Lexer.getLoc();
   Lexer.Lex();
 
@@ -1209,8 +1210,6 @@ bool AsmParser::ParseDirectiveDarwinDumpOrLoad(SMLoc IDLoc, bool IsDump) {
   if (Lexer.isNot(AsmToken::String))
     return TokError("expected string in '.dump' or '.load' directive");
   
-  Lexer.getCurStrVal();
-
   Lexer.Lex();
 
   if (Lexer.isNot(AsmToken::EndOfStatement))

diff --git a/tools/llvm-mc/llvm-mc.cpp b/tools/llvm-mc/llvm-mc.cpp
index 783e928c4e8f5c0b3a10b4403f27df4c4f34d752..63cb70d5049e194feb3f68bf770e75e843271a02 100644 (file)
--- a/tools/llvm-mc/llvm-mc.cpp
+++ b/tools/llvm-mc/llvm-mc.cpp
@@ -94,16 +94,16 @@ static int AsLexInput(const char *ProgName) {
       Error = true; // error already printed.
       break;
     case AsmToken::Identifier:
-      outs() << "identifier: " << Lexer.getCurStrVal() << '\n';
+      outs() << "identifier: " << Lexer.getTok().getString() << '\n';
       break;
     case AsmToken::Register:
-      outs() << "register: " << Lexer.getCurStrVal() << '\n';
+      outs() << "register: " << Lexer.getTok().getString() << '\n';
       break;
     case AsmToken::String:
-      outs() << "string: " << Lexer.getCurStrVal() << '\n';
+      outs() << "string: " << Lexer.getTok().getString() << '\n';
       break;
     case AsmToken::Integer:
-      outs() << "int: " << Lexer.getCurIntVal() << '\n';
+      outs() << "int: " << Lexer.getTok().getString() << '\n';
       break;
 
     case AsmToken::Amp:            outs() << "Amp\n"; break;