From 5d352b2d0a626db647dc54d7b61f37545c8b2852 Mon Sep 17 00:00:00 2001
From: Gabriel Dos Reis <gdr@integrable-solutions.net>
Date: Thu, 1 Dec 2005 12:00:17 +0000
Subject: [PATCH] re PR c++/13384 (error: non-lvalue in assignment - message a
 little misleading for C++)

        PR c/13384
        * c-common.c (lvalue_error): Fix wording.
testsuite/
        PR c/13384
        * gcc.dg/pr17730-1.c: Adjust.
        * gcc.dg/lvalue1.c (main): Likewise.
        * gcc.dg/lvalue-2.c: Likewise.
        * g++.dg/pr7503-3.C

From-SVN: r107816
---
 gcc/ChangeLog                       |  5 +++++
 gcc/c-common.c                      | 10 +++++-----
 gcc/testsuite/ChangeLog             |  8 ++++++++
 gcc/testsuite/g++.dg/opt/pr7503-3.C |  8 ++++----
 gcc/testsuite/gcc.dg/lvalue-2.c     | 12 ++++++------
 gcc/testsuite/gcc.dg/lvalue1.c      |  2 +-
 gcc/testsuite/gcc.dg/pr17730-1.c    |  2 +-
 7 files changed, 30 insertions(+), 17 deletions(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 1cc025158594..e0715c43a857 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2005-12-01  Gabriel Dos Reis  <gdr@integrable-solutions.net>
+
+	PR c/13384
+	* c-common.c (lvalue_error): Fix wording.
+
 2005-12-01  Richard Guenther  <rguenther@suse.de>
 
 	* tree-ssa-forwprop.c (forward_propagate_addr_expr): Fix
diff --git a/gcc/c-common.c b/gcc/c-common.c
index 43c147b30686..e61709459589 100644
--- a/gcc/c-common.c
+++ b/gcc/c-common.c
@@ -5990,19 +5990,19 @@ lvalue_error (enum lvalue_use use)
   switch (use)
     {
     case lv_assign:
-      error ("invalid lvalue in assignment");
+      error ("lvalue required as left operand of assignment");
       break;
     case lv_increment:
-      error ("invalid lvalue in increment");
+      error ("lvalue required as increment operand");
       break;
     case lv_decrement:
-      error ("invalid lvalue in decrement");
+      error ("lvalue required as decrement operand");
       break;
     case lv_addressof:
-      error ("invalid lvalue in unary %<&%>");
+      error ("lvalue required as unary %<&%> operand");
       break;
     case lv_asm:
-      error ("invalid lvalue in asm statement");
+      error ("lvalue required in asm statement");
       break;
     default:
       gcc_unreachable ();
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 71f0c9b88c20..a7f9194f24a8 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,11 @@
+2005-12-01  Gabriel Dos Reis  <gdr@integrable-solutions.net>
+
+        PR c/13384
+	* gcc.dg/pr17730-1.c: Adjust.
+	* gcc.dg/lvalue1.c (main): Likewise.
+	* gcc.dg/lvalue-2.c: Likewise.
+	* g++.dg/pr7503-3.C
+
 2005-12-01  Geoffrey Keating  <geoffk@apple.com>
 
 	* gcc.target/powerpc/pr18096-1.c: Be more liberal about possible
diff --git a/gcc/testsuite/g++.dg/opt/pr7503-3.C b/gcc/testsuite/g++.dg/opt/pr7503-3.C
index 4e8de0f207ca..dc71d20638b1 100644
--- a/gcc/testsuite/g++.dg/opt/pr7503-3.C
+++ b/gcc/testsuite/g++.dg/opt/pr7503-3.C
@@ -6,21 +6,21 @@ extern int A, B;
 
 void test1()
 {
-  (A++ <? B) = 0;  // { dg-error "lvalue in assignment" }
+  (A++ <? B) = 0;  // { dg-error "lvalue required" }
 }
 
 void test2()
 {
-  (A <? B++) = 0;  // { dg-error "lvalue in assignment" }
+  (A <? B++) = 0;  // { dg-error "lvalue required" }
 }
 
 void test3()
 {
-  (A++ >? B) = 0;  // { dg-error "lvalue in assignment" }
+  (A++ >? B) = 0;  // { dg-error "lvalue required" }
 }
 
 void test4()
 {
-  (A >? B++) = 0;  // { dg-error "lvalue in assignment" }
+  (A >? B++) = 0;  // { dg-error "lvalue required" }
 }
 
diff --git a/gcc/testsuite/gcc.dg/lvalue-2.c b/gcc/testsuite/gcc.dg/lvalue-2.c
index 5ad648eece93..add3e78a5750 100644
--- a/gcc/testsuite/gcc.dg/lvalue-2.c
+++ b/gcc/testsuite/gcc.dg/lvalue-2.c
@@ -9,12 +9,12 @@ int a, b;
 void
 f0 (void)
 {
-  (a+b) = 1; /* { dg-error "error: invalid lvalue in assignment" } */
-  (a+b)++; /* { dg-error "error: invalid lvalue in increment" } */
-  ++(a+b); /* { dg-error "error: invalid lvalue in increment" } */
-  (a+b)--; /* { dg-error "error: invalid lvalue in decrement" } */
-  --(a+b); /* { dg-error "error: invalid lvalue in decrement" } */
-  &(a+b); /* { dg-error "error: invalid lvalue in unary '&'" } */
+  (a+b) = 1; /* { dg-error "lvalue required as left operand of assignment" } */
+  (a+b)++; /* { dg-error "lvalue required as increment operand" } */
+  ++(a+b); /* { dg-error "lvalue required as increment operand" } */
+  (a+b)--; /* { dg-error "lvalue required as decrement operand" } */
+  --(a+b); /* { dg-error "lvalue required as decrement operand" } */
+  &(a+b); /* { dg-error "lvalue required as unary '&' operand" } */
 }
 
 const int c;
diff --git a/gcc/testsuite/gcc.dg/lvalue1.c b/gcc/testsuite/gcc.dg/lvalue1.c
index 7e21608ab36a..67b013078c88 100644
--- a/gcc/testsuite/gcc.dg/lvalue1.c
+++ b/gcc/testsuite/gcc.dg/lvalue1.c
@@ -4,6 +4,6 @@
 int main()
 {
   int i;
-  +i = 1;	/* { dg-error "invalid lvalue in assignment" } */
+  +i = 1;	/* { dg-error "lvalue required as left operand of assignment" } */
   return 0;
 }
diff --git a/gcc/testsuite/gcc.dg/pr17730-1.c b/gcc/testsuite/gcc.dg/pr17730-1.c
index 0fede2f6d6c2..fe9be68eff64 100644
--- a/gcc/testsuite/gcc.dg/pr17730-1.c
+++ b/gcc/testsuite/gcc.dg/pr17730-1.c
@@ -2,4 +2,4 @@
 /* { dg-do compile } */
 /* { dg-options "" } */
 
-char *p = &'C'; /* { dg-error "error: invalid lvalue in unary '&'" } */
+char *p = &'C'; /* { dg-error "error: lvalue required as unary '&' operand" } */
-- 
2.47.2