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

diff --git a/include/clang/Lex/Lexer.h b/include/clang/Lex/Lexer.h
index 47a73fbd23e57bd2f8d2fc6e9a3ae665d9c81ff8..019153695a0432376e30ccdadc4f8b76bbf33fc9 100644 (file)
--- a/include/clang/Lex/Lexer.h
+++ b/include/clang/Lex/Lexer.h
@@ -25,6 +25,7 @@ namespace clang {
 class Diagnostic;
 class SourceManager;
 class Preprocessor;
+class DiagnosticInfo;
 
 /// Lexer - This provides a simple interface that turns a text buffer into a
 /// stream of tokens.  This provides no support for file reading or buffering,
@@ -171,8 +172,7 @@ public:
  
   /// Diag - Forwarding function for diagnostics.  This translate a source
   /// position in the current buffer into a SourceLocation object for rendering.
-  void Diag(const char *Loc, unsigned DiagID,
-            const std::string &Msg = std::string()) const;
+  DiagnosticInfo Diag(const char *Loc, unsigned DiagID) const;
 
   /// getSourceLocation - Return a source location identifier for the specified
   /// offset in the current file.

diff --git a/include/clang/Lex/Preprocessor.h b/include/clang/Lex/Preprocessor.h
index 165000484f6c8690989c9c2d80a3b6b8a0aa6267..76073fe99a9e08555ccc90a73a8ddb4e48560ba8 100644 (file)
--- a/include/clang/Lex/Preprocessor.h
+++ b/include/clang/Lex/Preprocessor.h
@@ -397,16 +397,14 @@ public:
   /// 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 Diag(SourceLocation Loc, unsigned DiagID);  
+  DiagnosticInfo Diag(SourceLocation Loc, unsigned DiagID);  
+  DiagnosticInfo Diag(const Token &Tok, unsigned DiagID);
   void Diag(SourceLocation Loc, unsigned DiagID, const std::string &Msg);
   void Diag(SourceLocation Loc, unsigned DiagID, const std::string &Msg,
             const SourceRange &R1, const SourceRange &R2);
   void Diag(SourceLocation Loc, unsigned DiagID, const SourceRange &R);
   void Diag(SourceLocation Loc, unsigned DiagID, const SourceRange &R1,
             const SourceRange &R2);
-  void Diag(const Token &Tok, unsigned DiagID) {
-    Diag(Tok.getLocation(), DiagID);
-  }
   void Diag(const Token &Tok, unsigned DiagID, const std::string &Msg) {
     Diag(Tok.getLocation(), DiagID, Msg);
   }

diff --git a/lib/Lex/Lexer.cpp b/lib/Lex/Lexer.cpp
index 4e93600a87763b13854f833dc64412df4765bd55..8ddd62fe998314ac39779ca63d63ced6d7d6151a 100644 (file)
--- a/lib/Lex/Lexer.cpp
+++ b/lib/Lex/Lexer.cpp
@@ -306,11 +306,10 @@ SourceLocation Lexer::getSourceLocation(const char *Loc) const {
 
 /// Diag - Forwarding function for diagnostics.  This translate a source
 /// position in the current buffer into a SourceLocation object for rendering.
-void Lexer::Diag(const char *Loc, unsigned DiagID,
-                 const std::string &Msg) const {
+DiagnosticInfo Lexer::Diag(const char *Loc, unsigned DiagID) const {
   if (LexingRawMode && Diagnostic::isBuiltinNoteWarningOrExtension(DiagID))
-    return;
-  PP->Diag(getSourceLocation(Loc), DiagID, Msg);
+    return DiagnosticInfo(0, FullSourceLoc(), 0);
+  return PP->Diag(getSourceLocation(Loc), DiagID);
 }
 
 //===----------------------------------------------------------------------===//
@@ -340,14 +339,14 @@ static char GetTrigraphCharForLetter(char Letter) {
 /// whether trigraphs are enabled or not.
 static char DecodeTrigraphChar(const char *CP, Lexer *L) {
   char Res = GetTrigraphCharForLetter(*CP);
-  if (Res && L) {
-    if (!L->getFeatures().Trigraphs) {
-      L->Diag(CP-2, diag::trigraph_ignored);
-      return 0;
-    } else {
-      L->Diag(CP-2, diag::trigraph_converted, std::string()+Res);
-    }
+  if (!Res || !L) return Res;
+  
+  if (!L->getFeatures().Trigraphs) {
+    L->Diag(CP-2, diag::trigraph_ignored);
+    return 0;
   }
+    
+  L->Diag(CP-2, diag::trigraph_converted) << std::string()+Res;
   return Res;
 }
 

diff --git a/lib/Lex/PPDirectives.cpp b/lib/Lex/PPDirectives.cpp
index 69a3efe287c7f797c17deb769352ab380698330d..f67b1b20120127951100e6b6c0806b74af278071 100644 (file)
--- a/lib/Lex/PPDirectives.cpp
+++ b/lib/Lex/PPDirectives.cpp
@@ -48,8 +48,10 @@ void Preprocessor::ReadMacroName(Token &MacroNameTok, char isDefineUndef) {
   LexUnexpandedToken(MacroNameTok);
   
   // Missing macro name?
-  if (MacroNameTok.is(tok::eom))
-    return Diag(MacroNameTok, diag::err_pp_missing_macro_name);
+  if (MacroNameTok.is(tok::eom)) {
+    Diag(MacroNameTok, diag::err_pp_missing_macro_name);
+    return;
+  }
   
   IdentifierInfo *II = MacroNameTok.getIdentifierInfo();
   if (II == 0) {
@@ -489,8 +491,10 @@ void Preprocessor::HandleIdentSCCSDirective(Token &Tok) {
   
   // If the token kind isn't a string, it's a malformed directive.
   if (StrTok.isNot(tok::string_literal) &&
-      StrTok.isNot(tok::wide_string_literal))
-    return Diag(StrTok, diag::err_pp_malformed_ident);
+      StrTok.isNot(tok::wide_string_literal)) {
+    Diag(StrTok, diag::err_pp_malformed_ident);
+    return;
+  }
   
   // Verify that there is nothing after the string, other than EOM.
   CheckEndOfDirective("#ident");
@@ -658,16 +662,20 @@ void Preprocessor::HandleIncludeDirective(Token &IncludeTok,
   CheckEndOfDirective("#include");
 
   // Check that we don't have infinite #include recursion.
-  if (IncludeMacroStack.size() == MaxAllowedIncludeStackDepth-1)
-    return Diag(FilenameTok, diag::err_pp_include_too_deep);
+  if (IncludeMacroStack.size() == MaxAllowedIncludeStackDepth-1) {
+    Diag(FilenameTok, diag::err_pp_include_too_deep);
+    return;
+  }
   
   // Search include directories.
   const DirectoryLookup *CurDir;
   const FileEntry *File = LookupFile(FilenameStart, FilenameEnd,
                                      isAngled, LookupFrom, CurDir);
-  if (File == 0)
-    return Diag(FilenameTok, diag::err_pp_file_not_found,
-                std::string(FilenameStart, FilenameEnd));
+  if (File == 0) {
+    Diag(FilenameTok, diag::err_pp_file_not_found)
+       << std::string(FilenameStart, FilenameEnd);
+    return;
+  }
   
   // Ask HeaderInfo if we should enter this #include file.  If not, #including
   // this file will have no effect.
@@ -1101,7 +1109,8 @@ void Preprocessor::HandleEndifDirective(Token &EndifToken) {
   PPConditionalInfo CondInfo;
   if (CurPPLexer->popConditionalLevel(CondInfo)) {
     // No conditionals on the stack: this is an #endif without an #if.
-    return Diag(EndifToken, diag::err_pp_endif_without_if);
+    Diag(EndifToken, diag::err_pp_endif_without_if);
+    return;
   }
   
   // If this the end of a top-level #endif, inform MIOpt.
@@ -1120,8 +1129,10 @@ void Preprocessor::HandleElseDirective(Token &Result) {
   CheckEndOfDirective("#else");
   
   PPConditionalInfo CI;
-  if (CurPPLexer->popConditionalLevel(CI))
-    return Diag(Result, diag::pp_err_else_without_if);
+  if (CurPPLexer->popConditionalLevel(CI)) {
+    Diag(Result, diag::pp_err_else_without_if);
+    return;
+  }
   
   // If this is a top-level #else, inform the MIOpt.
   if (CurPPLexer->getConditionalStackDepth() == 0)
@@ -1145,8 +1156,10 @@ void Preprocessor::HandleElifDirective(Token &ElifToken) {
   DiscardUntilEndOfDirective();
 
   PPConditionalInfo CI;
-  if (CurPPLexer->popConditionalLevel(CI))
-    return Diag(ElifToken, diag::pp_err_elif_without_if);
+  if (CurPPLexer->popConditionalLevel(CI)) {
+    Diag(ElifToken, diag::pp_err_elif_without_if);
+    return;
+  }
   
   // If this is a top-level #elif, inform the MIOpt.
   if (CurPPLexer->getConditionalStackDepth() == 0)

diff --git a/lib/Lex/Pragma.cpp b/lib/Lex/Pragma.cpp
index cc224dd8d94cf8df2ffba363ea81a3443e3c1be6..dd5f144e342f7238ceed80382e66027d477115e1 100644 (file)
--- a/lib/Lex/Pragma.cpp
+++ b/lib/Lex/Pragma.cpp
@@ -102,13 +102,17 @@ void Preprocessor::Handle_Pragma(Token &Tok) {
   
   // Read the '('.
   Lex(Tok);
-  if (Tok.isNot(tok::l_paren))
-    return Diag(PragmaLoc, diag::err__Pragma_malformed);
+  if (Tok.isNot(tok::l_paren)) {
+    Diag(PragmaLoc, diag::err__Pragma_malformed);
+    return;
+  }
 
   // Read the '"..."'.
   Lex(Tok);
-  if (Tok.isNot(tok::string_literal) && Tok.isNot(tok::wide_string_literal))
-    return Diag(PragmaLoc, diag::err__Pragma_malformed);
+  if (Tok.isNot(tok::string_literal) && Tok.isNot(tok::wide_string_literal)) {
+    Diag(PragmaLoc, diag::err__Pragma_malformed);
+    return;
+  }
   
   // Remember the string.
   std::string StrVal = getSpelling(Tok);
@@ -116,8 +120,10 @@ void Preprocessor::Handle_Pragma(Token &Tok) {
 
   // Read the ')'.
   Lex(Tok);
-  if (Tok.isNot(tok::r_paren))
-    return Diag(PragmaLoc, diag::err__Pragma_malformed);
+  if (Tok.isNot(tok::r_paren)) {
+    Diag(PragmaLoc, diag::err__Pragma_malformed);
+    return;
+  }
   
   // The _Pragma is lexically sound.  Destringize according to C99 6.10.9.1.
   if (StrVal[0] == 'L')  // Remove L prefix.

diff --git a/lib/Lex/Preprocessor.cpp b/lib/Lex/Preprocessor.cpp
index 3357791b6cb617fad93d94c0a65e2fffa1a54304..2fe84c96bcf074aa83fd1130871a8b60d9278864 100644 (file)
--- 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;