commit 28eb7e992b9a266abb300da25b6d3c1557cec361
author Chris Lattner <sabre@nondot.org> Sun Nov 23 23:17:07 2008 +0000
committer Chris Lattner <sabre@nondot.org> Sun Nov 23 23:17:07 2008 +0000
tree 2f71d98d5aa3d90b0999645603c5a7fe89663f6c
parent 5f4a6829dc58cab2f76e2b98492859aa3b91e3f2

make the 'to match this' diagnostic a note.


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

lib/Lex/PPExpressions.cpp

diff --git a/lib/Lex/PPExpressions.cpp b/lib/Lex/PPExpressions.cpp
index 3eedf8c..168c9d0 100644
--- a/lib/Lex/PPExpressions.cpp
+++ b/lib/Lex/PPExpressions.cpp
@@ -137,7 +137,7 @@
     if (LParenLoc.isValid()) {
       if (PeekTok.isNot(tok::r_paren)) {
         PP.Diag(PeekTok.getLocation(), diag::err_pp_missing_rparen);
-        PP.Diag(LParenLoc, diag::err_matching) << "(";
+        PP.Diag(LParenLoc, diag::note_matching) << "(";
         return true;
       }
       // Consume the ).
@@ -261,7 +261,7 @@
       if (PeekTok.isNot(tok::r_paren)) {
         PP.Diag(PeekTok.getLocation(), diag::err_pp_expected_rparen)
           << Result.getRange();
-        PP.Diag(Start, diag::err_matching) << "(";
+        PP.Diag(Start, diag::note_matching) << "(";
         return true;
       }
       DT.State = DefinedTracker::Unknown;
@@ -606,7 +606,7 @@
       if (PeekTok.isNot(tok::colon)) {
         PP.Diag(PeekTok.getLocation(), diag::err_expected_colon)
           << LHS.getRange(), RHS.getRange();
-        PP.Diag(OpLoc, diag::err_matching) << "?";
+        PP.Diag(OpLoc, diag::note_matching) << "?";
         return true;
       }
       // Consume the :.

lib/Parse/ParseExpr.cpp

diff --git a/lib/Parse/ParseExpr.cpp b/lib/Parse/ParseExpr.cpp
index 21b3dac..a379eec 100644
--- a/lib/Parse/ParseExpr.cpp
+++ b/lib/Parse/ParseExpr.cpp
@@ -271,7 +271,7 @@
       
       if (Tok.isNot(tok::colon)) {
         Diag(Tok, diag::err_expected_colon);
-        Diag(OpToken, diag::err_matching) << "?";
+        Diag(OpToken, diag::note_matching) << "?";
         Actions.DeleteExpr(LHS.Val);
         Actions.DeleteExpr(TernaryMiddle.Val);
         return ExprResult(true);

lib/Parse/ParseExprCXX.cpp

diff --git a/lib/Parse/ParseExprCXX.cpp b/lib/Parse/ParseExprCXX.cpp
index 9eb2431..527aba2 100644
--- a/lib/Parse/ParseExprCXX.cpp
+++ b/lib/Parse/ParseExprCXX.cpp
@@ -199,7 +199,7 @@
   SourceLocation RAngleBracketLoc = Tok.getLocation();
 
   if (ExpectAndConsume(tok::greater, diag::err_expected_greater))
-    return Diag(LAngleBracketLoc, diag::err_matching) << "<";
+    return Diag(LAngleBracketLoc, diag::note_matching) << "<";
 
   SourceLocation LParenLoc = Tok.getLocation(), RParenLoc;
 

lib/Parse/ParseStmt.cpp

diff --git a/lib/Parse/ParseStmt.cpp b/lib/Parse/ParseStmt.cpp
index 221ad90..7006241 100644
--- a/lib/Parse/ParseStmt.cpp
+++ b/lib/Parse/ParseStmt.cpp
@@ -733,7 +733,7 @@
     ExitScope();
     if (!Body.isInvalid) {
       Diag(Tok, diag::err_expected_while);
-      Diag(DoLoc, diag::err_matching) << "do";
+      Diag(DoLoc, diag::note_matching) << "do";
       SkipUntil(tok::semi, false, true);
     }
     return true;

lib/Parse/Parser.cpp

diff --git a/lib/Parse/Parser.cpp b/lib/Parse/Parser.cpp
index ae75266..4e27e71 100644
--- a/lib/Parse/Parser.cpp
+++ b/lib/Parse/Parser.cpp
@@ -71,7 +71,7 @@
   case tok::greater:  LHSName = "<"; DID = diag::err_expected_greater; break;
   }
   Diag(Tok, DID);
-  Diag(LHSLoc, diag::err_matching) << LHSName;
+  Diag(LHSLoc, diag::note_matching) << LHSName;
   SkipUntil(RHSTok);
   return R;
 }