diff options
Diffstat (limited to 'clang')
| -rw-r--r-- | clang/lib/Lex/PPExpressions.cpp | 11 | ||||
| -rw-r--r-- | clang/test/Preprocessor/expr_comma.c | 10 |
2 files changed, 17 insertions, 4 deletions
diff --git a/clang/lib/Lex/PPExpressions.cpp b/clang/lib/Lex/PPExpressions.cpp index 6343a3c0983..3c0bf5c59c8 100644 --- a/clang/lib/Lex/PPExpressions.cpp +++ b/clang/lib/Lex/PPExpressions.cpp @@ -328,9 +328,9 @@ static unsigned getPrecedence(tok::TokenKind Kind) { case tok::pipe: return 7; case tok::ampamp: return 6; case tok::pipepipe: return 5; - case tok::question: return 4; - case tok::colon: return 3; - case tok::comma: return 2; + case tok::comma: return 4; + case tok::question: return 3; + case tok::colon: return 2; case tok::r_paren: return 0; // Lowest priority, end of expr. case tok::eom: return 0; // Lowest priority, end of macro. } @@ -543,7 +543,10 @@ static bool EvaluateDirectiveSubExpr(llvm::APSInt &LHS, unsigned MinPrec, Res.setIsUnsigned(false); // C99 6.5.14p3, result is always int (signed) break; case tok::comma: - PP.Diag(OpToken, diag::ext_pp_comma_expr); + // Comma is invalid in pp expressions in c89/c++ mode, but is valid in C99 + // if not being evaluated. + if (!PP.getLangOptions().C99 || ValueLive) + PP.Diag(OpToken, diag::ext_pp_comma_expr); Res = RHS; // LHS = LHS,RHS -> RHS. break; case tok::question: { diff --git a/clang/test/Preprocessor/expr_comma.c b/clang/test/Preprocessor/expr_comma.c new file mode 100644 index 00000000000..55072723f6b --- /dev/null +++ b/clang/test/Preprocessor/expr_comma.c @@ -0,0 +1,10 @@ +// Comma is not allowed in C89 +// RUN: not clang -E %s -std=c89 -pedantic-errors + +// Comma is allowed if unevaluated in C99 +// RUN: clang -E %s -std=c99 -pedantic-errors + +// PR2279 + +#if 0? 1,2:3 +#endif |
