Fix a few more bugs in preprocessor expressions w.r.t. ?:.  Now I 
think it is really right. :)  This fixes PR2284.

llvm-svn: 50665
diff --git a/clang/test/Preprocessor/expr_invalid_tok.c b/clang/test/Preprocessor/expr_invalid_tok.c
index 2918bc6..82bfca3 100644
--- a/clang/test/Preprocessor/expr_invalid_tok.c
+++ b/clang/test/Preprocessor/expr_invalid_tok.c
@@ -1,5 +1,6 @@
 // RUN: not clang -E %s 2>&1 | grep 'invalid token at start of a preprocessor expression'
 // RUN: not clang -E %s 2>&1 | grep 'token is not a valid binary operator in a preprocessor subexpression'
+// RUN: not clang -E %s 2>&1 | grep ':14: error: expected end of line in preprocessor expression'
 // PR2220
 
 #if 1 * * 2
@@ -8,3 +9,7 @@
 #if 4 [ 2
 #endif
 
+
+// PR2284 - The constant-expr production does not including comma.
+#if 1 ? 2 : 0, 1
+#endif