/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.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@127581 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 89172af..15e1819 100644 (file)
--- 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 b4ffd2f..70006c9 100644 (file)
--- 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 b8f5839..ee7d70a 100644 (file)
--- 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 (file)
index 0000000..18769ef
--- /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'" }
+};