From patchwork Mon Nov 19 14:04:38 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Carlini X-Patchwork-Id: 200008 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 17E282C00F3 for ; Tue, 20 Nov 2012 01:05:25 +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=1353938726; h=Comment: DomainKey-Signature:Received:Received:Received:Received:Received: Received:Received:Message-ID:Date:From:User-Agent:MIME-Version: To:CC:Subject:Content-Type:Mailing-List:Precedence:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:Sender: Delivered-To; bh=GmavCCiTuxcwYj53OMex8aGAeFg=; b=jA2wOlGTExk0EFu sLJg3n0I1TwjxoC1WC1YAALr+vO7Jqfydh6LhwzYbVKWOg7lpbgIKQHaoMnoTxVp X/82oBR0RCL/RF66KToQDj88XqxsDH7oIObyTTywIRTmZXHg/jh1VcS6aoHg76P9 iLj4FQhjyx2fqhmuZ13vjlQkX3zc= 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:Received:Message-ID:Date:From:User-Agent:MIME-Version:To:CC:Subject:Content-Type:X-IsSubscribed:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=bUWk/iT7h5X2B70sSfRjFx1BsVQNAPZvscb0mZ/nTa6pWi9gjMsyGfLzXonq1z 21Uaw9znJiR7AIP04egZijZJKQkkFkuxLqvKtayIocLAAIoJPuFGbXdK1Ovrw8G5 st1q8u2kt4bsLAHDmqXcPCHic0yDGXexZoby1Y3jKZm8M=; Received: (qmail 16985 invoked by alias); 19 Nov 2012 14:05:15 -0000 Received: (qmail 16925 invoked by uid 22791); 19 Nov 2012 14:05:13 -0000 X-SWARE-Spam-Status: No, hits=-4.9 required=5.0 tests=AWL, BAYES_00, RCVD_IN_HOSTKARMA_NO, RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from userp1040.oracle.com (HELO userp1040.oracle.com) (156.151.31.81) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Mon, 19 Nov 2012 14:04:42 +0000 Received: from ucsinet21.oracle.com (ucsinet21.oracle.com [156.151.31.93]) by userp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qAJE4fWf023978 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 19 Nov 2012 14:04:42 GMT Received: from acsmt357.oracle.com (acsmt357.oracle.com [141.146.40.157]) by ucsinet21.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qAJE4egL028546 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 19 Nov 2012 14:04:41 GMT Received: from abhmt104.oracle.com (abhmt104.oracle.com [141.146.116.56]) by acsmt357.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qAJE4e68031960; Mon, 19 Nov 2012 08:04:40 -0600 Received: from [192.168.1.4] (/79.33.220.109) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Mon, 19 Nov 2012 06:04:40 -0800 Message-ID: <50AA3C76.9060307@oracle.com> Date: Mon, 19 Nov 2012 15:04:38 +0100 From: Paolo Carlini User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:16.0) Gecko/20121025 Thunderbird/16.0.2 MIME-Version: 1.0 To: "gcc-patches@gcc.gnu.org" CC: Jason Merrill Subject: [C++ Patch] PR 55368 X-IsSubscribed: yes 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 Hi, the issue is that we accept a stray comma at the end of a member declaration. The reason is very simple: toward the end of the cp_parser_member_declaration main loop, we simply consume a comma token, without checking that isn't immediately followed by a semi colon. Thus the below, which passes testing on x86_64-linux. Alternately something like patch *_2? Thanks, Paolo. ////////////////////// /cp 2012-11-19 Paolo Carlini PR c++/55368 * parser.c (cp_parser_member_declaration): Emit an error in case of stray comma at end of member declaration. /testsuite 2012-11-19 Paolo Carlini PR c++/55368 * g++.dg/parse/struct-5.C: New. Index: parser.c =================================================================== --- parser.c (revision 193618) +++ parser.c (working copy) @@ -19004,6 +19003,7 @@ cp_token *initializer_token_start = NULL; int saved_pedantic; bool saved_colon_corrects_to_scope_p = parser->colon_corrects_to_scope_p; + bool seen_comma = false; /* Check for the `__extension__' keyword. */ if (cp_parser_extension_opt (parser, &saved_pedantic)) @@ -19407,7 +19407,10 @@ parser->object_scope = NULL_TREE; /* If it's a `,', then there are more declarators. */ if (cp_lexer_next_token_is (parser->lexer, CPP_COMMA)) - cp_lexer_consume_token (parser->lexer); + { + seen_comma = true; + cp_lexer_consume_token (parser->lexer); + } /* If the next token isn't a `;', then we have a parse error. */ else if (cp_lexer_next_token_is_not (parser->lexer, CPP_SEMICOLON)) @@ -19425,6 +19428,8 @@ and issue nonsensical error messages. */ assume_semicolon = true; } + else + seen_comma = false; if (decl) { @@ -19446,6 +19451,13 @@ } } + if (seen_comma) + { + cp_token *token = cp_lexer_previous_token (parser->lexer); + error_at (token->location, + "stray %<,%> at end of member declaration"); + } + cp_parser_require (parser, CPP_SEMICOLON, RT_SEMICOLON); out: parser->colon_corrects_to_scope_p = saved_colon_corrects_to_scope_p; Index: cp/parser.c =================================================================== --- cp/parser.c (revision 193618) +++ cp/parser.c (working copy) @@ -19407,7 +19406,15 @@ cp_parser_member_declaration (cp_parser* parser) parser->object_scope = NULL_TREE; /* If it's a `,', then there are more declarators. */ if (cp_lexer_next_token_is (parser->lexer, CPP_COMMA)) - cp_lexer_consume_token (parser->lexer); + { + cp_lexer_consume_token (parser->lexer); + if (cp_lexer_next_token_is (parser->lexer, CPP_SEMICOLON)) + { + cp_token *token = cp_lexer_previous_token (parser->lexer); + error_at (token->location, + "stray %<,%> at end of member declaration"); + } + } /* If the next token isn't a `;', then we have a parse error. */ else if (cp_lexer_next_token_is_not (parser->lexer, CPP_SEMICOLON)) Index: testsuite/g++.dg/parse/struct-5.C =================================================================== --- testsuite/g++.dg/parse/struct-5.C (revision 0) +++ testsuite/g++.dg/parse/struct-5.C (working copy) @@ -0,0 +1,3 @@ +// PR c++/55368 + +struct A { struct B *C,; }; // { dg-error "stray" }