diff options
| author | Dominique d'Humieres <dominiq@lps.ens.fr> | 2017-07-03 19:56:08 +0200 |
|---|---|---|
| committer | Dominique d'Humieres <dominiq@gcc.gnu.org> | 2017-07-03 19:56:08 +0200 |
| commit | 73977c4787a221078c07ec2960153d6eb4d713b3 (patch) | |
| tree | c2e57d34544f0e337dc5275cd517fb33019553c4 /gcc | |
| parent | 4ab42f4628a252095797dc8a29ddb327c40e8577 (diff) | |
| download | gcc-73977c4787a221078c07ec2960153d6eb4d713b3.zip gcc-73977c4787a221078c07ec2960153d6eb4d713b3.tar.gz gcc-73977c4787a221078c07ec2960153d6eb4d713b3.tar.bz2 | |
re PR fortran/79843 (diagnostics: missing word in fortran/symbol.c, conflict_std)
2017-07-03 Dominique d'Humieres <dominiq@lps.ens.fr>
PR fortran/79843
* symbol.c (check_conflict): Add missing "conflicts".
PR testsuite/79843
* gfortran.dg/namelist_3.f90: Adjust the dg-error string.
* gfortran.dg/pointer_intent_2.f90: Likewise.
From-SVN: r249933
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/fortran/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/fortran/symbol.c | 4 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/namelist_3.f90 | 2 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/pointer_intent_2.f90 | 2 |
5 files changed, 15 insertions, 4 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index e9043dd..3d0b88c 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,8 @@ +2017-07-03 Dominique d'Humieres <dominiq@lps.ens.fr> + + PR fortran/79843 + * symbol.c (check_conflict): Add missing "conflicts". + 2017-06-29 Cesar Philippidis <cesar@codesourcery.com> PR fortran/77765 diff --git a/gcc/fortran/symbol.c b/gcc/fortran/symbol.c index ec43e63..3bc2b34 100644 --- a/gcc/fortran/symbol.c +++ b/gcc/fortran/symbol.c @@ -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); } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 313a939..4c99694 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2017-07-03 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. + 2017-07-02 Jan Hubicka <hubicka@ucw.cz> PR middle-end/81290 diff --git a/gcc/testsuite/gfortran.dg/namelist_3.f90 b/gcc/testsuite/gfortran.dg/namelist_3.f90 index f37946d..3f20ea4 100644 --- a/gcc/testsuite/gfortran.dg/namelist_3.f90 +++ b/gcc/testsuite/gfortran.dg/namelist_3.f90 @@ -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 diff --git a/gcc/testsuite/gfortran.dg/pointer_intent_2.f90 b/gcc/testsuite/gfortran.dg/pointer_intent_2.f90 index 6925703..02f91b8 100644 --- a/gcc/testsuite/gfortran.dg/pointer_intent_2.f90 +++ b/gcc/testsuite/gfortran.dg/pointer_intent_2.f90 @@ -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 |