PR c++/28056

	* decl.c (grokdeclarator): Disallow declarations with qualified
	names in local scopes.
	PR c++/28056
	* g++.dg/parse/local1.C: New test.

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

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 629ba67..24fbf9a 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2006-08-25  Mark Mitchell  <mark@codesourcery.com>
+
+       PR c++/28056
+       * decl.c (grokdeclarator): Disallow declarations with qualified
+       names in local scopes.
+
 2006-08-25  Nathan Sidwell  <nathan@codesourcery.com>
 
        PR c++/27787

diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 8ba2a13..2d69cdb 100644 (file)
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -6948,7 +6948,27 @@ grokdeclarator (const cp_declarator *declarator,
              break;
            if (qualifying_scope)
              {
-               if (TYPE_P (qualifying_scope))
+               if (at_function_scope_p ())
+                 {
+                   /* [dcl.meaning] 
+
+                      A declarator-id shall not be qualified except
+                      for ... 
+
+                      None of the cases are permitted in block
+                      scope.  */
+                   if (qualifying_scope == global_namespace)
+                     error ("invalid use of qualified-name %<::%D%>",
+                            decl);
+                   else if (TYPE_P (qualifying_scope))
+                     error ("invalid use of qualified-name %<%T::%D%>",
+                            qualifying_scope, decl);
+                   else 
+                     error ("invalid use of qualified-name %<%D::%D%>",
+                            qualifying_scope, decl);
+                   return error_mark_node;
+                 }
+               else if (TYPE_P (qualifying_scope))
                  {
                    ctype = qualifying_scope;
                    if (innermost_code != cdk_function

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 8e9e60a..ee47bb3 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2006-08-25  Mark Mitchell  <mark@codesourcery.com>
+
+       PR c++/28056
+       * g++.dg/parse/local1.C: New test.
+
 2006-08-25  Nathan Sidwell  <nathan@codesourcery.com>
 
        PR c++/27787

diff --git a/gcc/testsuite/g++.dg/other/qual1.C b/gcc/testsuite/g++.dg/other/qual1.C
index bd6f234..e4bae23 100644 (file)
--- a/gcc/testsuite/g++.dg/other/qual1.C
+++ b/gcc/testsuite/g++.dg/other/qual1.C
@@ -6,6 +6,6 @@ struct A
   int i;
   void foo()
   {
-    int A::i = i;  // { dg-error "extra qualification|not a static member" }
+    int A::i = i;  // { dg-error "qualified" }
   }
 };

diff --git a/gcc/testsuite/g++.dg/parse/local1.C b/gcc/testsuite/g++.dg/parse/local1.C
new file mode 100644 (file)
index 0000000..cfcffc9
--- /dev/null
+++ b/gcc/testsuite/g++.dg/parse/local1.C
@@ -0,0 +1,18 @@
+// PR c++/28056
+
+void f1();
+
+namespace N {
+  void f2();
+}
+
+class C {
+  static void f3();
+};
+
+void foo() { 
+  void ::f1();  // { dg-error "qualified" }
+  void N::f2(); // { dg-error "qualified" }
+  void C::f3(); // { dg-error "qualified" }
+  void ::f4();  // { dg-error "qualified" }
+}