OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Don't allow template-id in using-declaration. 

cp/
       Don't allow template-id in using-declaration.
       * decl2.c (validate_nonmember_using_decl): Handle template-ids.
       (do_class_using_decl): Likewise.

testsuite/
       * g++.dg/other/using-declaration.C: New test.

From-SVN: r44663
This commit is contained in:
Gabriel Dos Reis 2001-08-06 16:04:08 +00:00 committed by Gabriel Dos Reis
parent 4f2b113946
commit eac69b8a00
4 changed files with 84 additions and 14 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 @@
2001-08-05 Gabriel Dos Reis <gdr@merlin.codesourcery.com>
Don't allow template-id in using-declaration.
* decl2.c (validate_nonmember_using_decl): Handle template-ids.
(do_class_using_decl): Likewise.
2001-08-04 Neil Booth <neil@cat.daikokuya.demon.co.uk>
* cp/spew.c (read_token): No need to pop buffers.

44
gcc/cp/decl2.c
View File

@ -4913,19 +4913,29 @@ validate_nonmember_using_decl (decl, scope, name)
*scope = TREE_OPERAND (decl, 0);
*name = TREE_OPERAND (decl, 1);
/* [namespace.udecl]
A using-declaration for a class member shall be a
member-declaration. */
if (!processing_template_decl
&& TREE_CODE (*scope) != NAMESPACE_DECL)
{
if (TYPE_P (*scope))
cp_error ("`%T' is not a namespace", *scope);
else
cp_error ("`%D' is not a namespace", *scope);
return NULL_TREE;
}
if (!processing_template_decl)
{
/* [namespace.udecl]
A using-declaration for a class member shall be a
member-declaration. */
if(TREE_CODE (*scope) != NAMESPACE_DECL)
{
if (TYPE_P (*scope))
cp_error ("`%T' is not a namespace", *scope);
else
cp_error ("`%D' is not a namespace", *scope);
return NULL_TREE;
}
/* 7.3.3/5
A using-declaration shall not name a template-id. */
if (TREE_CODE (*name) == TEMPLATE_ID_EXPR)
{
*name = TREE_OPERAND (*name, 0);
cp_error ("a using-declaration cannot specify a template-id. Try `using %D'", *name);
return NULL_TREE;
}
}
}
else if (TREE_CODE (decl) == IDENTIFIER_NODE
|| TREE_CODE (decl) == TYPE_DECL
@ -5129,7 +5139,13 @@ do_class_using_decl (decl)
cp_error ("using-declaration for destructor");
return NULL_TREE;
}
if (TREE_CODE (name) == TYPE_DECL)
else if (TREE_CODE (name) == TEMPLATE_ID_EXPR)
{
name = TREE_OPERAND (name, 0);
cp_error ("a using-declaration cannot specify a template-id. Try `using %T::%D'", TREE_OPERAND (decl, 0), name);
return NULL_TREE;
}
if (TREE_CODE (name) == TYPE_DECL || TREE_CODE (name) == TEMPLATE_DECL)
name = DECL_NAME (name);
my_friendly_assert (TREE_CODE (name) == IDENTIFIER_NODE, 980716);

4
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,7 @@
2001-08-05 Gabriel Dos Reis <gdr@merlin.codesourcery.com>
* g++.dg/other/using-declaration.C: New test.
2001-08-05 Neil Booth <neil@daikokuya.demon.co.uk>
* gcc.dg/cpp/tr-sign.c: New testcase.

44
gcc/testsuite/g++.dg/other/using-declaration.C Normal file
View File

@ -0,0 +1,44 @@
// Copyright (C) 2001 Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
// terms of the GNU General Public License as published by the
// Free Software Foundation; either version 2, or (at your option)
// any later version.
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
// You should have received a copy of the GNU General Public License along
// with this library; see the file COPYING. If not, write to the Free
// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
// USA.
// Contributed by Gabriel Dos Reis <gdr@codesourcery.com>
// { dg-do compile }
namespace N
{
template<int> void f() {}
}
using N::f< 0 >; // { dg-error "using-declaration" "" }
struct A {
template <class T> void f(T);
template <class T> struct X { };
};
struct B : A {
using A::X; // OK
using A::f; // OK
};
struct C : A {
using A::f<double>; // { dg-error "using-declaration" "" }
using A::X<int>; // { dg-error "parse error" "" }
};