aboutsummaryrefslogtreecommitdiff
path: root/clang/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
commit35d8703dbe89f717ef6c71b35e4b29aa51bbd7a7 (patch)
treeba2f4d9bc887ce0cb2af74b86fed4c36fb610400 /clang/lib/Lex/PPExpressions.cpp
parentbb79c338edc0abd2260ba7fdcb2d60ab16e473e4 (diff)
downloadllvm-35d8703dbe89f717ef6c71b35e4b29aa51bbd7a7.zip
llvm-35d8703dbe89f717ef6c71b35e4b29aa51bbd7a7.tar.gz
llvm-35d8703dbe89f717ef6c71b35e4b29aa51bbd7a7.tar.bz2
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. llvm-svn: 198252
Diffstat (limited to 'clang/lib/Lex/PPExpressions.cpp')
-rw-r--r--clang/lib/Lex/PPExpressions.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/clang/lib/Lex/PPExpressions.cpp b/clang/lib/Lex/PPExpressions.cpp
index 09d87de..f7c3be9 100644
--- a/clang/lib/Lex/PPExpressions.cpp
+++ b/clang/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;
}