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

gcc/fortran/ChangeLog

+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

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);
     }

gcc/testsuite/ChangeLog

+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

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

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