From decebe515433c392f5bf34105a538a5ee88c8640 Mon Sep 17 00:00:00 2001 From: Gabriel Dos Reis Date: Wed, 14 Jun 2006 22:14:18 +0000 Subject: [PATCH] * typeck.c (build_modify_expr): Tidy diagnostic message. From-SVN: r114658 --- gcc/cp/ChangeLog | 4 ++++ gcc/cp/typeck.c | 7 ++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index b0fc888475f..f8721f72202 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,7 @@ +2006-06-14 Gabriel Dos Reis + + * typeck.c (build_modify_expr): Tidy diagnostic message. + 2006-06-14 Mark Mitchell PR c++/28018 diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c index 5602ef2baa2..d50c08b0c7e 100644 --- a/gcc/cp/typeck.c +++ b/gcc/cp/typeck.c @@ -5708,7 +5708,12 @@ build_modify_expr (tree lhs, enum tree_code modifycode, tree rhs) /* Allow array assignment in compiler-generated code. */ if (! DECL_ARTIFICIAL (current_function_decl)) { - error ("array used as initializer"); + /* This routine is used for both initialization and assignment. + Make sure the diagnostic message differentiates the context. */ + if (modifycode == INIT_EXPR) + error ("array used as initializer"); + else + error ("invalid array assignment"); return error_mark_node; }