From patchwork Sat Mar 2 18:18:13 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mikael Morin X-Patchwork-Id: 224520 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 1CB102C02CF for ; Sun, 3 Mar 2013 05:18:41 +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=1362853122; h=Comment: DomainKey-Signature:Received:Received:Received:Received:Received: Message-ID:Date:From:User-Agent:MIME-Version:To:CC:Subject: References:In-Reply-To:Content-Type:Mailing-List:Precedence: List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender: Delivered-To; bh=L4zmW7nkLOiLEPUkCVJz5pG1yCA=; b=EMC4PP7udFHqcob ggQZaehsYZ3yTRPRkNMEnmluio0mcUave/Yh8Rh/jz38fPrw+smhGP9EYxdidu6R JpiF+jWqLMnc0ckuZRhEs4GatFUP6fG0V8gYEQuIbmUdXd0QAgKFqRzjlGSQ+7Uy 55QLNHm3Kwfu2AmeEtfqTZuvAEOE= 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:X-SFR-UUID:Message-ID:Date:From:User-Agent:MIME-Version:To:CC:Subject:References:In-Reply-To:Content-Type:X-IsSubscribed:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=pDQQqWv7+gnojZwsjrZIZuU2DdUpRqV3/ChZx3Iz1kvXf1+lbUvDNdRE4bRhDp nF8feThfvOyRfv6YRQCwUtsdQcpqbJzIt9nagEu/q72hWm+Dl4A7J5GIOAWdBYn/ egjjYMfTQc73/gJczxRF4ptvUnKZWNH7DFquM6en+uVY4=; Received: (qmail 12221 invoked by alias); 2 Mar 2013 18:18:30 -0000 Received: (qmail 12201 invoked by uid 22791); 2 Mar 2013 18:18:27 -0000 X-SWARE-Spam-Status: No, hits=-2.8 required=5.0 tests=AWL, BAYES_00, KHOP_THREADED, RCVD_IN_DNSWL_NONE, RP_MATCHES_RCVD, TW_TB X-Spam-Check-By: sourceware.org Received: from smtp23.services.sfr.fr (HELO smtp23.services.sfr.fr) (93.17.128.19) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Sat, 02 Mar 2013 18:18:20 +0000 Received: from filter.sfr.fr (localhost [127.0.0.1]) by msfrf2302.sfr.fr (SMTP Server) with ESMTP id EB0E670000A5; Sat, 2 Mar 2013 19:18:18 +0100 (CET) Received: from [192.168.1.58] (95.183.72.86.rev.sfr.net [86.72.183.95]) by msfrf2302.sfr.fr (SMTP Server) with ESMTP id 1076A700008E; Sat, 2 Mar 2013 19:18:17 +0100 (CET) X-SFR-UUID: 20130302181818675.1076A700008E@msfrf2302.sfr.fr Message-ID: <51324265.8040308@sfr.fr> Date: Sat, 02 Mar 2013 19:18:13 +0100 From: Mikael Morin User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130127 Thunderbird/17.0.2 MIME-Version: 1.0 To: Tobias Burnus CC: gfortran , GCC patches Subject: Re: [Patch, fortran] [0/5] PR54730 ICE: confused by type-like fonctions References: <20130219164810.30845.97901@marvin> <51278D6D.9060304@net-b.de> In-Reply-To: <51278D6D.9060304@net-b.de> 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 Le 22/02/2013 16:23, Tobias Burnus a écrit : > Regarding the naming, can you use a bit more speaking names? For > instance – without claiming that the naming choice is best: > "undo_changes" instead of "changes", "emtpy_undo_change_set_var" instead > of "change_set_var", "gfc_new_undo_checkpoint" instead of > "gfc_new_checkpoint". It can be also something different, but it should > imply what they a good for. > I'll change: gfc_change_set -> gfc_undo_change_set change_set_var -> default_undo_chgset_var changes -> latest_undo_chgset gfc_new_checkpoint -> gfc_new_undo_checkpoint gfc_drop_last_checkpoint -> gfc_drop_last_undo_checkpoint gfc_restore_last_checkpoint -> gfc_restore_last_undo_checkpoint free_change_set_data -> free_undo_change_set_data pop_change_set -> pop_undo_change_set I attach the corresponding patches. Will test and commit tomorrow. Mikael diff --git a/array.c b/array.c index 6787c05..6ee292c 100644 --- a/array.c +++ b/array.c @@ -1046,6 +1046,7 @@ match gfc_match_array_constructor (gfc_expr **result) { gfc_constructor_base head, new_cons; + gfc_undo_change_set changed_syms; gfc_expr *expr; gfc_typespec ts; locus where; @@ -1074,6 +1075,7 @@ gfc_match_array_constructor (gfc_expr **result) /* Try to match an optional "type-spec ::" */ gfc_clear_ts (&ts); + gfc_new_undo_checkpoint (changed_syms); if (gfc_match_decl_type_spec (&ts, 0) == MATCH_YES) { seen_ts = (gfc_match (" ::") == MATCH_YES); @@ -1082,19 +1084,28 @@ gfc_match_array_constructor (gfc_expr **result) { if (gfc_notify_std (GFC_STD_F2003, "Array constructor " "including type specification at %C") == FAILURE) - goto cleanup; + { + gfc_restore_last_undo_checkpoint (); + goto cleanup; + } if (ts.deferred) { gfc_error ("Type-spec at %L cannot contain a deferred " "type parameter", &where); + gfc_restore_last_undo_checkpoint (); goto cleanup; } } } - if (! seen_ts) - gfc_current_locus = where; + if (seen_ts) + gfc_drop_last_undo_checkpoint (); + else + { + gfc_restore_last_undo_checkpoint (); + gfc_current_locus = where; + } if (gfc_match (end_delim) == MATCH_YES) {