diff options
| author | Manuel López-Ibáñez <manu@gcc.gnu.org> | 2007-02-15 22:15:20 +0000 |
|---|---|---|
| committer | Manuel López-Ibáñez <manu@gcc.gnu.org> | 2007-02-15 22:15:20 +0000 |
| commit | 214931020be4420e7a5eb537813dc918b9cada58 (patch) | |
| tree | f7d6b79b1f01e65516552fe5cb37e658943bad5f /gcc | |
| parent | f173837aade126f9e3185425ab4c9fca7f7345dd (diff) | |
| download | gcc-214931020be4420e7a5eb537813dc918b9cada58.zip gcc-214931020be4420e7a5eb537813dc918b9cada58.tar.gz gcc-214931020be4420e7a5eb537813dc918b9cada58.tar.bz2 | |
re PR c++/28943 (Unusable error message when using a conditional-expression with multiple type arguments)
2007-02-15 Manuel Lopez-Ibanez <manu@gcc.gnu.org>
PR c++/28943
cp/
* call.c (build_conditional_expr): Improve error message.
testsuite/
* g++.dg/warn/pr28943.C: New.
From-SVN: r122016
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cp/call.c | 12 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/warn/pr28943.C | 15 |
4 files changed, 35 insertions, 2 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 342a7ba..fd068e4 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2007-02-15 Manuel Lopez-Ibanez <manu@gcc.gnu.org> + + PR c++/28943 + * call.c (build_conditional_expr): Improve error message. + 2007-02-13 Dirk Mueller <dmueller@suse.de> * friend.c (do_friend): Annotate warning about friend diff --git a/gcc/cp/call.c b/gcc/cp/call.c index ac29ecd..6690fa2 100644 --- a/gcc/cp/call.c +++ b/gcc/cp/call.c @@ -3281,8 +3281,16 @@ build_conditional_expr (tree arg1, tree arg2, tree arg3) result_type = void_type_node; else { - error ("%qE has type %<void%> and is not a throw-expression", - VOID_TYPE_P (arg2_type) ? arg2 : arg3); + if (VOID_TYPE_P (arg2_type)) + error ("second operand to the conditional operator " + "is of type %<void%>, " + "but the third operand is neither a throw-expression " + "nor of type %<void%>"); + else + error ("third operand to the conditional operator " + "is of type %<void%>, " + "but the second operand is neither a throw-expression " + "nor of type %<void%>"); return error_mark_node; } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 91420fc..b876518 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2007-02-15 Manuel Lopez-Ibanez <manu@gcc.gnu.org> + + PR c++/28943 + * g++.dg/warn/pr28943.C: New. + 2007-02-15 Jerry DeLisle <jvdelisle@gcc.gnu.org> * gfortran.fortran-torture/execute/math.f90: Fix typo. diff --git a/gcc/testsuite/g++.dg/warn/pr28943.C b/gcc/testsuite/g++.dg/warn/pr28943.C new file mode 100644 index 0000000..046312c --- /dev/null +++ b/gcc/testsuite/g++.dg/warn/pr28943.C @@ -0,0 +1,15 @@ +// PR c++/28943 void and non-void in conditional expression +// { dg-do compile } +// { dg-options "" } + +void debug (const char * string) +{ + return; +} + +int f() +{ + ( true == false ? 0 : debug ("Some string")); // { dg-error "third operand .* type 'void'.* second operand is neither a throw-expression nor of type 'void'" } + ( true == false ? debug ("Some string") : 0 ); // { dg-error "second operand .* type 'void'.* third operand is neither a throw-expression nor of type 'void'" } + return 0; +} |