From 968fc32d20c8dc013d0635055cc7f0f359062d5a Mon Sep 17 00:00:00 2001
From: Paolo Carlini <paolo@gcc.gnu.org>
Date: Fri, 17 Aug 2007 09:35:23 +0000
Subject: [PATCH] re PR c++/32870 (Unclear error message when declaring struct
in wrong namespace)
/cp
2007-08-17 Paolo Carlini <pcarlini@suse.de>
PR c++/32870
* parser.c (cp_parser_class_head): Improve error message.
/testsuite
2007-08-17 Paolo Carlini <pcarlini@suse.de>
PR c++/32870
* g++.dg/other/error17.C: Adjust.
From-SVN: r127581
---
gcc/cp/ChangeLog | 9 +++++++--
gcc/cp/parser.c | 8 ++++++--
gcc/testsuite/ChangeLog | 5 +++++
gcc/testsuite/g++.dg/other/error17.C | 13 +++++++++++++
4 files changed, 31 insertions(+), 4 deletions(-)
create mode 100644 gcc/testsuite/g++.dg/other/error17.C
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 89172af26d78..15e1819d09e2 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,7 +1,12 @@
+2007-08-17 Paolo Carlini <pcarlini@suse.de>
+
+ PR c++/32870
+ * parser.c (cp_parser_class_head): Improve error message.
+
2007-08-16 Seongbae Park <seongbae.park@gmail.com>
- * pt.c (instantiate_decl): Set input_location
- for the function end.
+ * pt.c (instantiate_decl): Set input_location
+ for the function end.
2007-08-16 Kaveh R. Ghazi <ghazi@caip.rutgers.edu>
diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index b4ffd2fa4bdd..70006c9174a8 100644
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -14417,8 +14417,12 @@ cp_parser_class_head (cp_parser* parser,
class was originally declared, the program is invalid. */
if (scope && !is_ancestor (scope, nested_name_specifier))
{
- error ("declaration of %qD in %qD which does not enclose %qD",
- type, scope, nested_name_specifier);
+ if (at_namespace_scope_p ())
+ error ("declaration of %qD in namespace %qD which does not "
+ "enclose %qD", type, scope, nested_name_specifier);
+ else
+ error ("declaration of %qD in %qD which does not enclose %qD",
+ type, scope, nested_name_specifier);
type = NULL_TREE;
goto done;
}
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index b8f5839bfae3..ee7d70a794e5 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2007-08-17 Paolo Carlini <pcarlini@suse.de>
+
+ PR c++/32870
+ * g++.dg/other/error17.C: Adjust.
+
2007-08-17 Ben Elliston <bje@au.ibm.com>
PR middle-end/32970
diff --git a/gcc/testsuite/g++.dg/other/error17.C b/gcc/testsuite/g++.dg/other/error17.C
new file mode 100644
index 000000000000..18769ef6bc4d
--- /dev/null
+++ b/gcc/testsuite/g++.dg/other/error17.C
@@ -0,0 +1,13 @@
+// PR c++/32870
+
+struct Foo {
+ struct Bar;
+};
+
+namespace N {
+ struct Foo::Bar { }; // { dg-error "in namespace 'N'" }
+}
+
+struct Baz {
+ struct Foo::Bar { }; // { dg-error "in 'struct Baz'" }
+};
--
GitLab