From f2ce60b88d09c376e9862b78e5d37045b2e92351 Mon Sep 17 00:00:00 2001 From: Nathan Sidwell Date: Tue, 28 Jan 2003 17:36:11 +0000 Subject: [PATCH] re PR c++/3902 ([parser] ambiguous 8.2/7) cp: PR c++/3902 * parser.c (cp_parser_decl_specifier_seq): Cannot have constructor inside a declarator. testsuite: PR c++/3902 * g++.dg/parse/template5.C: New test. From-SVN: r61987 --- gcc/cp/ChangeLog | 6 ++++++ gcc/cp/parser.c | 4 ++-- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/g++.dg/parse/template5.C | 19 +++++++++++++++++++ 4 files changed, 32 insertions(+), 2 deletions(-) create mode 100644 gcc/testsuite/g++.dg/parse/template5.C diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 180fccb2fbf..09445a066a7 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2003-01-28 Nathan Sidwell + + PR c++/3902 + * parser.c (cp_parser_decl_specifier_seq): Cannot have constructor + inside a declarator. + 2003-01-27 Nathan Sidwell * class.c (update_vtable_entry_for_fn): Add index parameter. diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c index 7e172abd555..1561f4ce034 100644 --- a/gcc/cp/parser.c +++ b/gcc/cp/parser.c @@ -6518,8 +6518,8 @@ cp_parser_decl_specifier_seq (cp_parser* parser, { tree decl_specs = NULL_TREE; bool friend_p = false; - bool constructor_possible_p = true; - + bool constructor_possible_p = !parser->in_declarator_p; + /* Assume no class or enumeration type is declared. */ *declares_class_or_enum = false; diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index dcf48426c22..cc38d837c65 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2003-01-28 Nathan Sidwell + + PR c++/3902 + * g++.dg/parse/template5.C: New test. + 2003-01-28 Toon Moene PR fortran/9258 diff --git a/gcc/testsuite/g++.dg/parse/template5.C b/gcc/testsuite/g++.dg/parse/template5.C new file mode 100644 index 00000000000..adc59867260 --- /dev/null +++ b/gcc/testsuite/g++.dg/parse/template5.C @@ -0,0 +1,19 @@ +// { dg-do compile } + +// Copyright (C) 2003 Free Software Foundation, Inc. +// Contributed by Nathan Sidwell 28 Jan 2003 + +// PR 3902. More type/decl confusion. + +template +struct S +{ + S foo (T (T)); + S foo (T(const T&)); +}; + +int main () +{ + S (S::*pf1)(int (int)) = &S::foo; + S (S::*pf2)(int (const int&)) = &S::foo; +} -- 2.30.2