Change a couple of the Parser::Diag methods to return DiagnosticInfo

and let the clients push whatever they want into the DiagnosticInfo
instead of hard coding a few forms.  Also switch various clients to
use Diag(Tok, ...) instead of Diag(Tok.getLocation(), ...) as the
canonical form to simplify the code a bit.


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

1 files changed, 3 insertions, 6 deletions

diff --git a/include/clang/Parse/Parser.h b/include/clang/Parse/Parser.h
index e6d3464c76..e6d7df5d37 100644
--- a/include/clang/Parse/Parser.h
+++ b/include/clang/Parse/Parser.h
@@ -27,6 +27,7 @@ namespace clang {
   class ObjCDeclSpec;
   class PragmaHandler;
   class Scope;
+  class DiagnosticInfo;
 
 /// Parser - This implements a parser for the C family of languages.  After
 /// parsing units of the grammar, productions are invoked to handle whatever has
@@ -312,15 +313,11 @@ private:
   //===--------------------------------------------------------------------===//
   // Diagnostic Emission and Error recovery.
     
-  bool Diag(SourceLocation Loc, unsigned DiagID,
-            const std::string &Msg = std::string());
+  DiagnosticInfo Diag(SourceLocation Loc, unsigned DiagID);
+  DiagnosticInfo Diag(const Token &Tok, unsigned DiagID);
   bool Diag(SourceLocation Loc, unsigned DiagID, const SourceRange &R);
   bool Diag(SourceLocation Loc, unsigned DiagID, const std::string &Msg,
             const SourceRange& R1);
-  bool Diag(const Token &Tok, unsigned DiagID,
-            const std::string &M = std::string()) {
-    return Diag(Tok.getLocation(), DiagID, M);
-  }
   
   /// SkipUntil - Read tokens until we get to the specified token, then consume
   /// it (unless DontConsume is true).  Because we cannot guarantee that the