Convert the lexer and start converting the PP over to using canonical Diag methods.

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

1 files changed, 7 insertions, 2 deletions

diff --git a/lib/Lex/Preprocessor.cpp b/lib/Lex/Preprocessor.cpp
index 3357791b6c..2fe84c96bc 100644
--- a/lib/Lex/Preprocessor.cpp
+++ b/lib/Lex/Preprocessor.cpp
@@ -118,10 +118,15 @@ Preprocessor::~Preprocessor() {
 /// Diag - Forwarding function for diagnostics.  This emits a diagnostic at
 /// the specified Token's location, translating the token's start
 /// position in the current buffer into a SourcePosition object for rendering.
-void Preprocessor::Diag(SourceLocation Loc, unsigned DiagID) {
-  Diags.Report(getFullLoc(Loc), DiagID);
+DiagnosticInfo Preprocessor::Diag(SourceLocation Loc, unsigned DiagID) {
+  return Diags.Report(getFullLoc(Loc), DiagID);
 }
 
+DiagnosticInfo Preprocessor::Diag(const Token &Tok, unsigned DiagID) {
+  return Diags.Report(getFullLoc(Tok.getLocation()), DiagID);
+}
+
+
 void Preprocessor::Diag(SourceLocation Loc, unsigned DiagID, 
                         const std::string &Msg) {
   Diags.Report(getFullLoc(Loc), DiagID) << Msg;