From patchwork Sat Nov 17 15:23:14 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Dodji Seketeli X-Patchwork-Id: 199859 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) by ozlabs.org (Postfix) with SMTP id A2CB72C007E for ; Sun, 18 Nov 2012 02:23:32 +1100 (EST) Comment: DKIM? See http://www.dkim.org DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=gcc.gnu.org; s=default; x=1353770614; h=Comment: DomainKey-Signature:Received:Received:Received:Received:Received: Received:From:To:Cc:Subject:References:Date:In-Reply-To: Message-ID:User-Agent:MIME-Version:Content-Type: Content-Transfer-Encoding:Mailing-List:Precedence:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:Sender: Delivered-To; bh=QJs9cB1VnMbfFbuZ5J+AwODWYIE=; b=cszVmyf4VQs6wIW KIxVI16ubVWeVzRop5gVH0BlUD0bt/qb+A8UgY39wN5tkG66K0fBL2K/PhLyfWK9 WjK+pvMq7UDiZGdZFeOoi3m1d0VXiggoCCgO9T/uUuBdyYmFs41fSIxdc9+cUmyB bbbgZg2KaV6UYl6Cdbvcj4pUpmBw= Comment: DomainKeys? See http://antispam.yahoo.com/domainkeys DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=default; d=gcc.gnu.org; h=Received:Received:X-SWARE-Spam-Status:X-Spam-Check-By:Received:Received:Received:Received:From:To:Cc:Subject:References:X-URL:Date:In-Reply-To:Message-ID:User-Agent:MIME-Version:Content-Type:Content-Transfer-Encoding:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=lWmrIX8MrjPaBhxtc+m1k9ynrox9T8vNe4Mv0vLQ0jW4NDhz+0y8TJ4LkJ5tuR 1rKjb7uIO/G1VjMcZVeozyO1tXarz9CYJcAib4PBfjbD4xwlS9CrTT7w29cVb+G8 GC49Ry9hemp4YhXqBZk6W+vudiGL2q8LTPoOez50DzS1M=; Received: (qmail 7758 invoked by alias); 17 Nov 2012 15:23:26 -0000 Received: (qmail 7746 invoked by uid 22791); 17 Nov 2012 15:23:25 -0000 X-SWARE-Spam-Status: No, hits=-6.1 required=5.0 tests=AWL, BAYES_00, KHOP_RCVD_UNTRUST, RCVD_IN_DNSWL_HI, RCVD_IN_HOSTKARMA_W, RP_MATCHES_RCVD, SPF_HELO_PASS X-Spam-Check-By: sourceware.org Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Sat, 17 Nov 2012 15:23:19 +0000 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id qAHFNJtl004181 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Sat, 17 Nov 2012 10:23:19 -0500 Received: from localhost (ovpn-116-79.ams2.redhat.com [10.36.116.79]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id qAHFNGj2006720 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Sat, 17 Nov 2012 10:23:17 -0500 Received: by localhost (Postfix, from userid 1000) id 2C83C2C0104; Sat, 17 Nov 2012 16:23:15 +0100 (CET) From: Dodji Seketeli To: Gabriel Dos Reis Cc: Jason Merrill , GCC Patches Subject: Re: [PING] [PATCH] PR c++/54401 - Confusing diagnostics about type-alias at class scope References: <87626yupft.fsf@redhat.com> <874nkpvfk3.fsf@seketeli.org> <50A652F6.9000804@redhat.com> X-URL: http://www.seketeli.net/~dodji Date: Sat, 17 Nov 2012 16:23:14 +0100 In-Reply-To: (Gabriel Dos Reis's message of "Fri, 16 Nov 2012 09:51:51 -0600") Message-ID: <87ehjstfrx.fsf@seketeli.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.1 (gnu/linux) MIME-Version: 1.0 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Gabriel Dos Reis a écrit: > On Fri, Nov 16, 2012 at 8:51 AM, Jason Merrill wrote: >> Would it work to just do a cp_parser_commit_to_tentative_parse after we see >> the '='? I guess you mean in cp_parser_alias_declaration like in the updated patch below? > I like that solution better. Ok, thanks. I just had to adjust the call to cp_parser_alias_declaration when called in the context of a tentative parse, to handle the case where an error occurs before we reach the '=' token; which means that the tentative parse can still be cancelled. Bootstrapped and tested on x86_64-unknown-linux-gnu against trunk. gcc/cp/ * parser.c (cp_parser_alias_declaration): Commit to tentative parse when see the '=' token. Get out if the type-id is invalid. Update function comment. (cp_parser_member_declaration): Don't try to parse a using declaration if we know that we expected an alias declaration; that is, if we see the '=' token after the identifier. gcc/testsuite/ * g++.dg/cpp0x/alias-decl-28.C: New test. * g++.dg/cpp0x/alias-decl-16.C: Update. --- gcc/cp/parser.c | 23 +++++++++++++++++++++-- gcc/testsuite/g++.dg/cpp0x/alias-decl-16.C | 2 +- gcc/testsuite/g++.dg/cpp0x/alias-decl-28.C | 7 +++++++ 3 files changed, 29 insertions(+), 3 deletions(-) create mode 100644 gcc/testsuite/g++.dg/cpp0x/alias-decl-28.C diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c index 7107134..2b76670 100644 --- a/gcc/cp/parser.c +++ b/gcc/cp/parser.c @@ -15260,7 +15260,11 @@ cp_parser_using_declaration (cp_parser* parser, /* Parse an alias-declaration. alias-declaration: - using identifier attribute-specifier-seq [opt] = type-id */ + using identifier attribute-specifier-seq [opt] = type-id + + Note that if this function is used in the context of a tentative + parse, it commits the currently active tentative parse after it + sees the '=' token. */ static tree cp_parser_alias_declaration (cp_parser* parser) @@ -15293,6 +15297,8 @@ cp_parser_alias_declaration (cp_parser* parser) if (cp_parser_error_occurred (parser)) return error_mark_node; + cp_parser_commit_to_tentative_parse (parser); + /* Now we are going to parse the type-id of the declaration. */ /* @@ -15322,6 +15328,9 @@ cp_parser_alias_declaration (cp_parser* parser) if (parser->num_template_parameter_lists) parser->type_definition_forbidden_message = saved_message; + if (type == error_mark_node) + return error_mark_node; + cp_parser_require (parser, CPP_SEMICOLON, RT_SEMICOLON); if (cp_parser_error_occurred (parser)) @@ -19058,9 +19067,19 @@ cp_parser_member_declaration (cp_parser* parser) else { tree decl; + bool alias_decl_expected; cp_parser_parse_tentatively (parser); decl = cp_parser_alias_declaration (parser); - if (cp_parser_parse_definitely (parser)) + /* Note that if we actually see the '=' token after the + identifier, cp_parser_alias_declaration commits the + tentative parse. In that case, we really expects an + alias-declaration. Otherwise, we expect a using + declaration. */ + alias_decl_expected = + !cp_parser_uncommitted_to_tentative_parse_p (parser); + cp_parser_parse_definitely (parser); + + if (alias_decl_expected) finish_member_declaration (decl); else cp_parser_using_declaration (parser, diff --git a/gcc/testsuite/g++.dg/cpp0x/alias-decl-16.C b/gcc/testsuite/g++.dg/cpp0x/alias-decl-16.C index d66660a..ce6ad0a 100644 --- a/gcc/testsuite/g++.dg/cpp0x/alias-decl-16.C +++ b/gcc/testsuite/g++.dg/cpp0x/alias-decl-16.C @@ -23,6 +23,6 @@ template using A3 = enum B3 {b = 0;}; //{ dg-error "types may not be defined in alias template" } -A3 a3; +A3 a3; // { dg-error "'A3' does not name a type" } int main() { } diff --git a/gcc/testsuite/g++.dg/cpp0x/alias-decl-28.C b/gcc/testsuite/g++.dg/cpp0x/alias-decl-28.C new file mode 100644 index 0000000..086b5e5 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/alias-decl-28.C @@ -0,0 +1,7 @@ +// Origin: PR c++/54401 +// { dg-do compile { target c++11 } } + +template +struct X { + using type = T; // { dg-error "expected type-specifier|does not name a type" } +};