[Bug fortran/79843] diagnostics: missing word in fortran/symbol.c, conflict_std

[dominiq at lps dot ens.fr]

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=79843

Dominique d'Humieres <dominiq at lps dot ens.fr> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|UNCONFIRMED                 |ASSIGNED
   Last reconfirmed|                            |2017-06-29
           Assignee|unassigned at gcc dot gnu.org      |dominiq at lps dot ens.fr
     Ever confirmed|0                           |1

--- Comment #1 from Dominique d'Humieres <dominiq at lps dot ens.fr> ---
I am testing the following patch

--- ../_clean/gcc/fortran/symbol.c      2017-04-04 18:13:40.000000000 +0200
+++ gcc/fortran/symbol.c        2017-06-29 15:02:15.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