diff options
| author | Thomas König <tkoenig@gcc.gnu.org> | 2020-02-23 17:04:06 +0100 |
|---|---|---|
| committer | Thomas König <tkoenig@gcc.gnu.org> | 2020-02-23 17:09:01 +0100 |
| commit | 7260547dbffd8e6442f99da8adf98ab0ce294e4e (patch) | |
| tree | bbb51bedb1cdcc9a79c4cb33237938758ca0be63 /gcc | |
| parent | 61c8d9e4e5f540501eaa98aae1d6c74bde7d4299 (diff) | |
| download | gcc-7260547dbffd8e6442f99da8adf98ab0ce294e4e.zip gcc-7260547dbffd8e6442f99da8adf98ab0ce294e4e.tar.gz gcc-7260547dbffd8e6442f99da8adf98ab0ce294e4e.tar.bz2 | |
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.
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/fortran/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/fortran/interface.c | 4 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/argument_checking_24.f90 | 8 |
4 files changed, 17 insertions, 6 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 6795b82..5f889fb 100644 --- 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 429abc7..4106fe5 100644 --- 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 fe93624..06d61c7 100644 --- 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 a5f3abe..79096cd 100644 --- 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) |