summaryrefslogtreecommitdiffstats
path: root/lib/Lex/PPExpressions.cpp
diff options
context:
space:
mode:
authorAlp Toker <alp@nuanti.com>2013-12-30 23:29:50 +0000
committerAlp Toker <alp@nuanti.com>2013-12-30 23:29:50 +0000
commit0e39d5d027f226967bfb09673485a35ba40ee724 (patch)
treefe8aa6be229088a1c334003a5737429b9acf8272 /lib/Lex/PPExpressions.cpp
parent2b0d1d3457a68cb95c5cd066f3dcdf7870e8f394 (diff)
Switch over more of the parser to err_expected
Includes a fix for a missing highlight range caused by a ',' typo in the PP diagnostics. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@198252 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Lex/PPExpressions.cpp')
-rw-r--r--lib/Lex/PPExpressions.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/Lex/PPExpressions.cpp b/lib/Lex/PPExpressions.cpp
index 09d87de86b..f7c3be9958 100644
--- a/lib/Lex/PPExpressions.cpp
+++ b/lib/Lex/PPExpressions.cpp
@@ -681,8 +681,8 @@ static bool EvaluateDirectiveSubExpr(PPValue &LHS, unsigned MinPrec,
case tok::question: {
// Parse the : part of the expression.
if (PeekTok.isNot(tok::colon)) {
- PP.Diag(PeekTok.getLocation(), diag::err_expected_colon)
- << LHS.getRange(), RHS.getRange();
+ PP.Diag(PeekTok.getLocation(), diag::err_expected)
+ << tok::colon << LHS.getRange() << RHS.getRange();
PP.Diag(OpLoc, diag::note_matching) << tok::question;
return true;
}