aboutsummaryrefslogtreecommitdiff
path: root/lib/Lex/PPExpressions.cpp
diff options
context:
space:
mode:
authorChris Lattner <sabre@nondot.org>2008-04-13 20:38:43 +0000
committerChris Lattner <sabre@nondot.org>2008-04-13 20:38:43 +0000
commitd98d975ccdce7ec442ac26f682404cb71df40ff8 (patch)
tree88cf0cc1c4a0eb40b63d9bee4ce3faa3665ff1fb /lib/Lex/PPExpressions.cpp
parent72e1c6cee10c0325a0398b6d8a065862665e4b13 (diff)
Fix PR2220, making diagnostics for unexpected tokens in pp expressions
more nice. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@49619 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Lex/PPExpressions.cpp')
-rw-r--r--lib/Lex/PPExpressions.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/Lex/PPExpressions.cpp b/lib/Lex/PPExpressions.cpp
index cca7628917..398567be36 100644
--- a/lib/Lex/PPExpressions.cpp
+++ b/lib/Lex/PPExpressions.cpp
@@ -131,7 +131,7 @@ static bool EvaluateValue(llvm::APSInt &Result, Token &PeekTok,
switch (PeekTok.getKind()) {
default: // Non-value token.
- PP.Diag(PeekTok, diag::err_pp_expr_bad_token);
+ PP.Diag(PeekTok, diag::err_pp_expr_bad_token_start_expr);
return true;
case tok::eom:
case tok::r_paren:
@@ -349,7 +349,7 @@ static bool EvaluateDirectiveSubExpr(llvm::APSInt &LHS, unsigned MinPrec,
unsigned PeekPrec = getPrecedence(PeekTok.getKind());
// If this token isn't valid, report the error.
if (PeekPrec == ~0U) {
- PP.Diag(PeekTok, diag::err_pp_expr_bad_token);
+ PP.Diag(PeekTok, diag::err_pp_expr_bad_token_binop);
return true;
}
@@ -392,7 +392,7 @@ static bool EvaluateDirectiveSubExpr(llvm::APSInt &LHS, unsigned MinPrec,
// If this token isn't valid, report the error.
if (PeekPrec == ~0U) {
- PP.Diag(PeekTok, diag::err_pp_expr_bad_token);
+ PP.Diag(PeekTok, diag::err_pp_expr_bad_token_binop);
return true;
}