From: "Dominique d'Humières" <dominiq@lps.ens.fr>
To: gfortran <fortran@gcc.gnu.org>
Cc: gcc-patches <gcc-patches@gcc.gnu.org>
Subject: [PATCH fortran] Bug 79843 - diagnostics: missing word in fortran/symbol.c, conflict_std
Date: Sat, 01 Jul 2017 11:02:00 -0000 [thread overview]
Message-ID: <27D71006-A318-46E5-A9E8-577F50E8AB5F@lps.ens.fr> (raw)
If there is no objection, I am planning to commit the following patch as obvious.
Cheers,
Dominique
2017-07-01 Dominique d'Humieres <dominiq@lps.ens.fr>
PR fortran/79843
* symbol.c (check_conflict): Add missing "conflicts".
2017-07-01 Dominique d'Humieres <dominiq@lps.ens.fr>
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 == 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 attribute" }
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.000000000 +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 conflicts with INTENT attribute" }
end subroutine
end program
reply other threads:[~2017-07-01 11:02 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=27D71006-A318-46E5-A9E8-577F50E8AB5F@lps.ens.fr \
--to=dominiq@lps.ens.fr \
--cc=fortran@gcc.gnu.org \
--cc=gcc-patches@gcc.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).