Fix error message.

2020-02-23  Thomas Koenig  <tkoenig@gcc.gnu.org>

	PR fortran/93890
	* interface.c: Replace "can not" by "cannot" and remove trailing
	space.

2020-02-23  Thomas Koenig  <tkoenig@gcc.gnu.org>

	PR fortran/93890
	* gfortran.dg/argument_checking_24.f90: Correct test case.

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 6795b82b74cd6844157977f0ba0cdb106cddaf2f..5f889fb312091183b937d987c5794d7653e9c6ac 100644 (file)
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,9 @@
+2020-02-23  Thomas Koenig  <tkoenig@gcc.gnu.org>
+
+       PR fortran/93890
+       * interface.c: Replace "can not" by "cannot" and remove trailing
+       space.
+
 2020-02-20  Tobias Burnus  <tobias@codesourcery.com>
 
        PR fortran/93825

diff --git a/gcc/fortran/interface.c b/gcc/fortran/interface.c
index 429abc79ca2e41b04a62d9e4c7741a2a3bab6f2f..4106fe5831b3de7811e461e9619830dea453a567 100644 (file)
--- a/gcc/fortran/interface.c
+++ b/gcc/fortran/interface.c
@@ -2660,8 +2660,8 @@ compare_parameter (gfc_symbol *formal, gfc_expr *actual,
        {
          if (formal->attr.artificial)
            gfc_error ("Element of assumed-shape or pointer array "
-                      "as actual argument at %L can not correspond to "
-                      "actual argument at %L ",
+                      "as actual argument at %L cannot correspond to "
+                      "actual argument at %L",
                       &actual->where, &formal->declared_at);
          else
            gfc_error ("Element of assumed-shape or pointer "

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index fe9362434acc71b38428543abb4cc9fd5026b920..06d61c7e2ee0c512bf697fcb99556c98b34b98ac 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2020-02-23  Thomas Koenig  <tkoenig@gcc.gnu.org>
+
+       PR fortran/93890
+       * gfortran.dg/argument_checking_24.f90: Correct test case.
+
 2020-02-21  Martin Sebor  <msebor@redhat.com>
 
        PR gcov-profile/93753

diff --git a/gcc/testsuite/gfortran.dg/argument_checking_24.f90 b/gcc/testsuite/gfortran.dg/argument_checking_24.f90
index a5f3abee3a8aa9627dbf5d59233a0ce1a4cf29e4..79096cd59afdd3da88d1be35c244148754ce973e 100644 (file)
--- a/gcc/testsuite/gfortran.dg/argument_checking_24.f90
+++ b/gcc/testsuite/gfortran.dg/argument_checking_24.f90
@@ -33,14 +33,14 @@ contains
     call invalid_4 (b) ! { dg-error "Rank mismatch" }w
     call invalid_5 (b) ! { dg-error "Rank mismatch" }
     call invalid_5 (vv(1)%x) ! { dg-error "Rank mismatch" }
-    call invalid_6 (x) ! { dg-error "can not correspond to actual argument" }
-    call invalid_6 (pointer_v%x(1)) ! { dg-error "can not correspond to actual argument" }
+    call invalid_6 (x) ! { dg-error "cannot correspond to actual argument" }
+    call invalid_6 (pointer_v%x(1)) ! { dg-error "cannot correspond to actual argument" }
     call invalid_7 (pointer_v%x(1)) ! { dg-error "Rank mismatch" }
     call invalid_7 (x) ! { dg-error "Rank mismatch" }
     call invalid_8 (p(1)) ! { dg-error "Rank mismatch" }
     call invalid_8 (x) ! { dg-error "Rank mismatch" }
-    call invalid_9 (x) ! { dg-error "can not correspond to actual argument" }
-    call invalid_9 (p(1)) ! { dg-error "can not correspond to actual argument" }
+    call invalid_9 (x) ! { dg-error "cannot correspond to actual argument" }
+    call invalid_9 (p(1)) ! { dg-error "cannot correspond to actual argument" }
   end subroutine foo
 
   subroutine bar(a, alloc)