This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
[PATCH fortran] Bug 79843 - diagnostics: missing word in fortran/symbol.c, conflict_std
- From: Dominique d'Humières <dominiq at lps dot ens dot fr>
- To: gfortran <fortran at gcc dot gnu dot org>
- Cc: gcc-patches <gcc-patches at gcc dot gnu dot org>
- Date: Sat, 1 Jul 2017 13:02:44 +0200
- Subject: [PATCH fortran] Bug 79843 - diagnostics: missing word in fortran/symbol.c, conflict_std
- Authentication-results: sourceware.org; auth=none
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