Modified MCAsmLexer to return error information upward

rather than printing it locally, reducing its dependence
on SourceMgr.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@94041 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Sean Callanan 2010-01-20 22:18:24 +00:00
parent 73a1aa0966
commit 79036e421f
3 changed files with 29 additions and 4 deletions

View File

@ -12,11 +12,11 @@
#include "llvm/ADT/StringRef.h"
#include "llvm/System/DataTypes.h"
#include "llvm/Support/SMLoc.h"
namespace llvm {
class MCAsmLexer;
class MCInst;
class SMLoc;
class Target;
/// AsmToken - Target independent representation for an assembler token.
@ -103,6 +103,10 @@ public:
class MCAsmLexer {
/// The current token, stored in the base class for faster access.
AsmToken CurTok;
/// The location and description of the current error
SMLoc ErrLoc;
std::string Err;
MCAsmLexer(const MCAsmLexer &); // DO NOT IMPLEMENT
void operator=(const MCAsmLexer &); // DO NOT IMPLEMENT
@ -110,7 +114,12 @@ protected: // Can only create subclasses.
MCAsmLexer();
virtual AsmToken LexToken() = 0;
void SetError(const SMLoc &errLoc, const std::string &err) {
ErrLoc = errLoc;
Err = err;
}
public:
virtual ~MCAsmLexer();
@ -126,6 +135,16 @@ public:
const AsmToken &getTok() {
return CurTok;
}
/// getErrLoc - Get the current error location
const SMLoc &getErrLoc() {
return ErrLoc;
}
/// getErr - Get the current error string
const std::string &getErr() {
return Err;
}
/// getKind - Get the kind of current token.
AsmToken::TokenKind getKind() const { return CurTok.getKind(); }

View File

@ -44,7 +44,8 @@ void AsmLexer::PrintMessage(SMLoc Loc, const std::string &Msg,
/// ReturnError - Set the error to the specified string at the specified
/// location. This is defined to always return AsmToken::Error.
AsmToken AsmLexer::ReturnError(const char *Loc, const std::string &Msg) {
PrintMessage(SMLoc::getFromPointer(Loc), Msg, "error");
SetError(SMLoc::getFromPointer(Loc), Msg);
return AsmToken(AsmToken::Error, StringRef(Loc, 0));
}

View File

@ -101,7 +101,12 @@ bool AsmParser::TokError(const char *Msg) {
}
const AsmToken &AsmParser::Lex() {
return Lexer.Lex();
const AsmToken &tok = Lexer.Lex();
if (tok.is(AsmToken::Error))
Lexer.PrintMessage(Lexer.getErrLoc(), Lexer.getErr(), "error");
return tok;
}
bool AsmParser::Run() {