[llvm-commits] [llvm] r77323 - in /llvm/trunk/tools/llvm-mc: AsmLexer.cpp AsmLexer.h AsmParser.cpp llvm-mc.cpp
Daniel Dunbar
daniel at zuster.org
Tue Jul 28 09:38:45 PDT 2009
Author: ddunbar
Date: Tue Jul 28 11:38:40 2009
New Revision: 77323
URL: http://llvm.org/viewvc/llvm-project?rev=77323&view=rev
Log:
Drop some AsmLexer methods in favor of their AsmToken equivalents.
Modified:
llvm/trunk/tools/llvm-mc/AsmLexer.cpp
llvm/trunk/tools/llvm-mc/AsmLexer.h
llvm/trunk/tools/llvm-mc/AsmParser.cpp
llvm/trunk/tools/llvm-mc/llvm-mc.cpp
Modified: llvm/trunk/tools/llvm-mc/AsmLexer.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-mc/AsmLexer.cpp?rev=77323&r1=77322&r2=77323&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-mc/AsmLexer.cpp (original)
+++ llvm/trunk/tools/llvm-mc/AsmLexer.cpp Tue Jul 28 11:38:40 2009
@@ -35,6 +35,10 @@
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);
Modified: llvm/trunk/tools/llvm-mc/AsmLexer.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-mc/AsmLexer.h?rev=77323&r1=77322&r2=77323&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-mc/AsmLexer.h (original)
+++ llvm/trunk/tools/llvm-mc/AsmLexer.h Tue Jul 28 11:38:40 2009
@@ -72,6 +72,11 @@
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 @@
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);
Modified: llvm/trunk/tools/llvm-mc/AsmParser.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-mc/AsmParser.cpp?rev=77323&r1=77322&r2=77323&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-mc/AsmParser.cpp (original)
+++ llvm/trunk/tools/llvm-mc/AsmParser.cpp Tue Jul 28 11:38:40 2009
@@ -99,7 +99,7 @@
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 @@
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 @@
}
// 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 @@
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 @@
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 @@
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 @@
// 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 @@
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 @@
// 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 @@
// 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::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 @@
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 @@
// 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 @@
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 @@
// 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 @@
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 @@
if (Lexer.isNot(AsmToken::String))
return TokError("expected string in '.dump' or '.load' directive");
- Lexer.getCurStrVal();
-
Lexer.Lex();
if (Lexer.isNot(AsmToken::EndOfStatement))
Modified: llvm/trunk/tools/llvm-mc/llvm-mc.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-mc/llvm-mc.cpp?rev=77323&r1=77322&r2=77323&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-mc/llvm-mc.cpp (original)
+++ llvm/trunk/tools/llvm-mc/llvm-mc.cpp Tue Jul 28 11:38:40 2009
@@ -94,16 +94,16 @@
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;
More information about the llvm-commits
mailing list