Ping: [C++ PATCH] [PR C++ 22154] [DR 382] qualified names should allow typename keyword in front of it (even in non-templates)
Andrew Pinski
Andrew_Pinski@playstation.sony.com
Thu Jun 25 20:00:00 GMT 2009
Ping 1.
---------- Forwarded message ----------
From: Andrew Pinski <Andrew_Pinski@playstation.sony.com>
Date: Tue, Jun 2, 2009 at 6:34 PM
Subject: [C++ PATCH] [PR C++ 22154] [DR 382] qualified names should
allow typename keyword in front of it (even in non-templates)
To: GCC Patches <gcc-patches@gcc.gnu.org>
Hi,
I implemented this Defect report in the C++ front-end. I originally
wrote this for the PS3 toolchain which is a 4.1.1 based GCC. It has
been tested on many different code and does not accept non qualified
names with the typename keyword.
OK? Bootstrapped and tested on i686-linux-gnu with no regressions.
Thanks,
Andrew Pinski
cp/ChangeLog:
* parser.c (cp_parser_elaborated_type_specifier): Accept typename in
front of qualified names.
testsuite/ChangeLog:
* g++.old-deja/g++.pt/typename10.C: Update for DR 382, typename in
front of qualified names are allowed.
* g++.dg/parse/crash10.C: Likewise.
* g++.dg/parse/error15.C: Likewise.
* g++.dg/parse/typename9.C: Likewise.
* g++.dg/parse/error8.C: Likewise.
-------------- next part --------------
Index: testsuite/g++.old-deja/g++.pt/typename10.C
===================================================================
--- testsuite/g++.old-deja/g++.pt/typename10.C (revision 148104)
+++ testsuite/g++.old-deja/g++.pt/typename10.C (working copy)
@@ -4,4 +4,4 @@ struct S {
typedef int I;
};
-void f(typename S::I); // { dg-error "" } using typename outside of template
+void f(typename S::I);
Index: testsuite/g++.dg/parse/crash10.C
===================================================================
--- testsuite/g++.dg/parse/crash10.C (revision 148104)
+++ testsuite/g++.dg/parse/crash10.C (working copy)
@@ -9,5 +9,5 @@
class
{
- typename:: // { dg-error "" "" }
+ typename::
; // { dg-error "" "" }
Index: testsuite/g++.dg/parse/error15.C
===================================================================
--- testsuite/g++.dg/parse/error15.C (revision 148104)
+++ testsuite/g++.dg/parse/error15.C (working copy)
@@ -14,7 +14,7 @@ N::A f2; // { dg-error "1:i
N::INVALID f3; // { dg-error "1:'INVALID' in namespace 'N' does not name a type" }
N::C::INVALID f4; // { dg-error "1:'INVALID' in class 'N::C' does not name a type" }
N::K f6; // { dg-error "1:'K' in namespace 'N' does not name a type" }
-typename N::A f7; // { dg-error "1:using 'typename' outside of template" "1" }
+typename N::A f7;
// { dg-error "13:invalid use of template-name 'N::A' without an argument list" "13" { target *-*-* } 17 }
// { dg-error "17:invalid type in declaration before ';' token" "17" { target *-*-* } 17 }
@@ -24,7 +24,7 @@ struct B
N::INVALID f3; // { dg-error "3:'INVALID' in namespace 'N' does not name a type" }
N::C::INVALID f4; // { dg-error "3:'INVALID' in class 'N::C' does not name a type" }
N::K f6; // { dg-error "3:'K' in namespace 'N' does not name a type" }
- typename N::A f7; // { dg-error "3:using 'typename' outside of template" }
+ typename N::A f7;
// { dg-error "15:invalid use of template-name 'N::A' without an argument list" "15" { target *-*-* } 27 }
};
Index: testsuite/g++.dg/parse/typename9.C
===================================================================
--- testsuite/g++.dg/parse/typename9.C (revision 148104)
+++ testsuite/g++.dg/parse/typename9.C (working copy)
@@ -1,3 +1,6 @@
+// check that using a qualified name with a typename does
+// not report an error.
+
struct A { typedef int X; };
-int i = typename A::X(); // { dg-error "typename" }
+int i = typename A::X();
Index: testsuite/g++.dg/parse/error8.C
===================================================================
--- testsuite/g++.dg/parse/error8.C (revision 148104)
+++ testsuite/g++.dg/parse/error8.C (working copy)
@@ -4,7 +4,6 @@
struct A { friend typename struct B; };
-// { dg-error "19:using 'typename' outside of template" "" { target *-*-* } 4 }
// { dg-error "28:expected nested-name-specifier before 'struct'" "" { target *-*-* } 4 }
// { dg-error "35:multiple types in one declaration" "" { target *-*-* } 4 }
// { dg-error "12:friend declaration does not name a class or function" "" { target *-*-* } 4 }
Index: cp/parser.c
===================================================================
--- cp/parser.c (revision 148104)
+++ cp/parser.c (working copy)
@@ -11518,6 +11518,7 @@ cp_parser_elaborated_type_specifier (cp_
tree identifier;
tree type = NULL_TREE;
tree attributes = NULL_TREE;
+ tree globalscope;
cp_token *token = NULL;
/* See if we're looking at the `enum' keyword. */
@@ -11549,9 +11550,6 @@ cp_parser_elaborated_type_specifier (cp_
cp_lexer_consume_token (parser->lexer);
/* Remember that it's a `typename' type. */
tag_type = typename_type;
- /* The `typename' keyword is only allowed in templates. */
- if (!processing_template_decl)
- permerror (input_location, "using %<typename%> outside of template");
}
/* Otherwise it must be a class-key. */
else
@@ -11564,10 +11562,10 @@ cp_parser_elaborated_type_specifier (cp_
}
/* Look for the `::' operator. */
- cp_parser_global_scope_opt (parser,
- /*current_scope_valid_p=*/false);
+ globalscope = cp_parser_global_scope_opt (parser,
+ /*current_scope_valid_p=*/false);
/* Look for the nested-name-specifier. */
- if (tag_type == typename_type)
+ if (tag_type == typename_type && !globalscope)
{
if (!cp_parser_nested_name_specifier (parser,
/*typename_keyword_p=*/true,
More information about the Gcc-patches
mailing list