summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjsm28 <jsm28@138bc75d-0d04-0410-961f-82ee72b054a4>2004-10-02 19:15:45 +0000
committerjsm28 <jsm28@138bc75d-0d04-0410-961f-82ee72b054a4>2004-10-02 19:15:45 +0000
commit5a6aa39e1b2f6146fd133d6b851a920a74804959 (patch)
treedda008c67b94a4327b7bd81b4869f35e15693667
parentb991d49eaff458357a19c70fa016ba2a4bb53fb8 (diff)
downloadgcc-5a6aa39e1b2f6146fd133d6b851a920a74804959.tar.gz
* 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. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@88431 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--gcc/ChangeLog5
-rw-r--r--gcc/c-objc-common.c7
-rw-r--r--gcc/testsuite/ChangeLog4
-rw-r--r--gcc/testsuite/gcc.dg/20040920-1.c4
4 files changed, 16 insertions, 4 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 02ce00f8163..4f13472646e 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 0259fe5de60..4d321364cc1 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 26e97385b40..e01eb72d372 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 8813963f973..a38ff888930 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" } */
}