From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 69284 invoked by alias); 1 Jul 2017 11:02:53 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Received: (qmail 69252 invoked by uid 89); 1 Jul 2017 11:02:51 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-10.0 required=5.0 tests=AWL,BAYES_00,GIT_PATCH_2,GIT_PATCH_3,KAM_LAZY_DOMAIN_SECURITY,RP_MATCHES_RCVD autolearn=ham version=3.3.2 spammy=H*r:ip*192.168.1.11, Hx-spam-relays-external:sk:mailhos, H*RU:sk:mailhos, H*r:sk:mailhos X-Spam-User: qpsmtpd, 2 recipients X-HELO: nef2.ens.fr Received: from nef2.ens.fr (HELO nef2.ens.fr) (129.199.96.40) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Sat, 01 Jul 2017 11:02:49 +0000 Received: from mailhost.lps.ens.fr (tournesol.lps.ens.fr [129.199.120.1]) by nef2.ens.fr (8.13.6/1.01.28121999) with ESMTP id v61B2jMj039169 ; Sat, 1 Jul 2017 13:02:45 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mailhost.lps.ens.fr (Postfix) with ESMTP id 42794175; Sat, 1 Jul 2017 13:02:45 +0200 (CEST) Received: from mailhost.lps.ens.fr ([127.0.0.1]) by localhost (tournesol.lps.ens.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id OnJI-qW1bEbT; Sat, 1 Jul 2017 13:02:45 +0200 (CEST) Received: from [192.168.1.11] (log78-1-82-242-47-10.fbx.proxad.net [82.242.47.10]) by mailhost.lps.ens.fr (Postfix) with ESMTPSA id 15C93171; Sat, 1 Jul 2017 13:02:45 +0200 (CEST) From: =?utf-8?Q?Dominique_d=27Humi=C3=A8res?= Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable Mime-Version: 1.0 (Mac OS X Mail 10.3 \(3273\)) Subject: [PATCH fortran] Bug 79843 - diagnostics: missing word in fortran/symbol.c, conflict_std Message-Id: <27D71006-A318-46E5-A9E8-577F50E8AB5F@lps.ens.fr> Date: Sat, 01 Jul 2017 11:02:00 -0000 Cc: gcc-patches To: gfortran X-SW-Source: 2017-07/txt/msg00004.txt.bz2 If there is no objection, I am planning to commit the following patch as ob= vious. Cheers, Dominique 2017-07-01 Dominique d'Humieres PR fortran/79843 * symbol.c (check_conflict): Add missing "conflicts". 2017-07-01 Dominique d'Humieres PR testsuite/79843 * gfortran.dg/namelist_3.f90: Adjust the dg-error string. * gfortran.dg/pointer_intent_2.f90: Likewise. --- ../_clean/gcc/fortran/symbol.c 2017-04-04 18:13:40.000000000 +0200 +++ gcc/fortran/symbol.c 2017-06-30 19:35:24.000000000 +0200 @@ -845,13 +845,13 @@ conflict: conflict_std: if (name =3D=3D NULL) { - return gfc_notify_std (standard, "%s attribute " + return gfc_notify_std (standard, "%s attribute conflicts " "with %s attribute at %L", a1, a2, where); } else { - return gfc_notify_std (standard, "%s attribute " + return gfc_notify_std (standard, "%s attribute conflicts " "with %s attribute in %qs at %L", a1, a2, name, where); } --- ../_clean/gcc/testsuite/gfortran.dg/namelist_3.f90 2017-04-28 16:22:54.= 000000000 +0200 +++ gcc/testsuite/gfortran.dg/namelist_3.f90 2017-06-29 15:29:45.000000000 = +0200 @@ -4,5 +4,5 @@ program namelist_3 integer,pointer :: x allocate (x) - namelist /n/ x ! { dg-error "NAMELIST attribute with POINTER attribute" } + namelist /n/ x ! { dg-error "NAMELIST attribute conflicts with POINTER a= ttribute" } end program namelist_3 --- ../_clean/gcc/testsuite/gfortran.dg/pointer_intent_2.f90 2009-11-25 18:= 17:47.000000000 +0100 +++ gcc/testsuite/gfortran.dg/pointer_intent_2.f90 2017-06-29 15:27:46.0000= 00000 +0200 @@ -14,6 +14,6 @@ program test call a(p) ! { dg-error "Type mismatch in argument" } contains subroutine a(p)! { dg-error "has no IMPLICIT type" } - integer, pointer,intent(in) :: p ! { dg-error "POINTER attribute with = INTENT attribute" } + integer, pointer,intent(in) :: p ! { dg-error "POINTER attribute confl= icts with INTENT attribute" } end subroutine end program