FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

re PR c++/28056 (enum accepted as scope)

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

From-SVN: r116410
This commit is contained in:
Mark Mitchell 2006-08-25 17:03:50 +00:00 • committed by Mark Mitchell
parent 7d3bec9db5
commit 2884e22c4b
5 changed files with 51 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
gcc/cp/ChangeLog
View file

@ -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

22
gcc/cp/decl.c
View file

@ -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

5
gcc/testsuite/ChangeLog
View file

@ -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

2
gcc/testsuite/g++.dg/other/qual1.C
View file

@ -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" }
}
};

18
gcc/testsuite/g++.dg/parse/local1.C Normal file
View file

@ -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" }
}