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

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index e9043dd1cdf45fc179989ded357d923148a28157..3d0b88c9b667e089d72fc80391da6adb76834de1 100644 (file)
--- 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 ec43e635bf3688f52b3bc21498f4995b9f1ecb59..3bc2b34768f88685f236b8e0846aec4d710ba7b8 100644 (file)
--- 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 313a939820bc70823b922ad3fa2d9e880116833e..4c99694bf3aa0eedb8dbcdfd754d45d2a755d7b0 100644 (file)
--- 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 f37946d53c9f7d188365a6ace834335ce7cbbd6b..3f20ea400c489a15f046de4a00c8337ae4c9ad31 100644 (file)
--- 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 692570339a36cac20e292bf799ad4a6d0b25aa2e..02f91b804958e6d547aeec27c02b6975ab93feb8 100644 (file)
--- 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