From: Joseph Myers <jsm@polyomino.org.uk>
Date: Sat, 2 Oct 2004 19:15:45 +0000 (+0100)
Subject: c-objc-common.c (c_tree_printer): Correct description of %E.
X-Git-Tag: releases/gcc-4.0.0~4409
X-Git-Url: https://gcc.gnu.org/git/?a=commitdiff_plain;h=7848dfcac199f677935254d6631ca03b02b677ea;p=gcc.git

c-objc-common.c (c_tree_printer): Correct description of %E.

	* c-objc-common.c (c_tree_printer): Correct description of %E.
	Don't fall through after printing an expression.

testsuite:
	* gcc.dg/20040920-1.c: Update expected message text.

From-SVN: r88431
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 02ce00f8163f..4f13472646ef 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2004-10-02  Joseph S. Myers  <jsm@polyomino.org.uk>
+
+	* c-objc-common.c (c_tree_printer): Correct description of %E.
+	Don't fall through after printing an expression.
+
 2004-10-02  Kazu Hirata  <kazu@cs.umass.edu>
 
 	* tree-cfg.c, config/s390/tpf-unwind.h: Fix comment typos.
diff --git a/gcc/c-objc-common.c b/gcc/c-objc-common.c
index 0259fe5de607..4d321364cc14 100644
--- a/gcc/c-objc-common.c
+++ b/gcc/c-objc-common.c
@@ -187,7 +187,7 @@ c_objc_common_init (void)
    source-level entity onto BUFFER.  The meaning of the format specifiers
    is as follows:
    %D: a general decl,
-   %E: An expression,
+   %E: an identifier or expression,
    %F: a function declaration,
    %T: a type.
 
@@ -235,7 +235,10 @@ c_tree_printer (pretty_printer *pp, text_info *text)
       if (TREE_CODE (t) == IDENTIFIER_NODE)
 	n = IDENTIFIER_POINTER (t);
       else
-	pp_expression (cpp, t);
+	{
+	  pp_expression (cpp, t);
+	  return true;
+	}
       break;
 
     default:
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 26e97385b409..e01eb72d372c 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2004-10-02  Joseph S. Myers  <jsm@polyomino.org.uk>
+
+	* gcc.dg/20040920-1.c: Update expected message text.
+
 2004-10-02  Ulrich Weigand  <uweigand@de.ibm.com>
 
 	* gcc.dg/tree-ssa/loop-1.c: Merge changed dg-options for s390-*-*.
diff --git a/gcc/testsuite/gcc.dg/20040920-1.c b/gcc/testsuite/gcc.dg/20040920-1.c
index 8813963f9739..a38ff8889304 100644
--- a/gcc/testsuite/gcc.dg/20040920-1.c
+++ b/gcc/testsuite/gcc.dg/20040920-1.c
@@ -7,6 +7,6 @@ struct a
 int main(void)
 {
   struct a bar;
-  bob(5); /* { dg-error "called object 'bob\\({anonymous}\\)' is not a function" } */
-  bar.foo(); /* { dg-error "called object 'bar.foo\\({anonymous}\\)' is not a function" } */
+  bob(5); /* { dg-error "called object 'bob' is not a function" } */
+  bar.foo(); /* { dg-error "called object 'bar.foo' is not a function" } */
 }