gcc/fortran:

2007-06-29  Daniel Franke <franke.daniel@gmail.com>

        * openmp.c (resolve_omp_clauses): Adjust error message to
        better reflect the actual requirement.

gcc/testsuite:
2007-06-29  Daniel Franke  <franke.daniel@gmail.com>

        * gfortran.dg/gomp/reduction1.f90: Adjust error message.
        * gfortran.dg/gomp/allocatable_components_1.f90: Likewise.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@126115 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/fortran/openmp.c b/gcc/fortran/openmp.c
index 54981ef..9494052 100644 (file)
--- a/gcc/fortran/openmp.c
+++ b/gcc/fortran/openmp.c
@@ -850,7 +850,7 @@ resolve_omp_clauses (gfc_code *code)
                  case OMP_LIST_MULT:
                  case OMP_LIST_SUB:
                    if (!gfc_numeric_ts (&n->sym->ts))
-                     gfc_error ("%c REDUCTION variable '%s' at %L must be of intrinsic type, got %s",
+                     gfc_error ("%c REDUCTION variable '%s' at %L must be of numeric type, got %s",
                                 list == OMP_LIST_PLUS ? '+'
                                 : list == OMP_LIST_MULT ? '*' : '-',
                                 n->sym->name, &code->loc,

diff --git a/gcc/testsuite/gfortran.dg/gomp/allocatable_components_1.f90 b/gcc/testsuite/gfortran.dg/gomp/allocatable_components_1.f90
index 02fcb1b..225d0a2 100644 (file)
--- a/gcc/testsuite/gfortran.dg/gomp/allocatable_components_1.f90
+++ b/gcc/testsuite/gfortran.dg/gomp/allocatable_components_1.f90
@@ -49,7 +49,7 @@ CONTAINS
     TYPE(t) :: a(10)
     INTEGER :: i
 
-    !$omp parallel do reduction(+: a)   ! { dg-error "must be of intrinsic type" }
+    !$omp parallel do reduction(+: a)   ! { dg-error "must be of numeric type" }
     DO i = 1, SIZE(a)
     END DO
     !$omp end parallel do

diff --git a/gcc/testsuite/gfortran.dg/gomp/reduction1.f90 b/gcc/testsuite/gfortran.dg/gomp/reduction1.f90
index 6d516ad..b657506 100644 (file)
--- a/gcc/testsuite/gfortran.dg/gomp/reduction1.f90
+++ b/gcc/testsuite/gfortran.dg/gomp/reduction1.f90
@@ -60,15 +60,15 @@ common /blk/ i1
 !$omp end parallel
 !$omp parallel reduction (*:ia1)       ! { dg-error "Assumed size" }
 !$omp end parallel
-!$omp parallel reduction (+:l1)                ! { dg-error "is LOGICAL" }
+!$omp parallel reduction (+:l1)                ! { dg-error "must be of numeric type, got LOGICAL" }
 !$omp end parallel
-!$omp parallel reduction (*:la1)       ! { dg-error "is LOGICAL" }
+!$omp parallel reduction (*:la1)       ! { dg-error "must be of numeric type, got LOGICAL" }
 !$omp end parallel
-!$omp parallel reduction (-:a1)                ! { dg-error "is CHARACTER" }
+!$omp parallel reduction (-:a1)                ! { dg-error "must be of numeric type, got CHARACTER" }
 !$omp end parallel
-!$omp parallel reduction (+:t1)                ! { dg-error "is TYPE" }
+!$omp parallel reduction (+:t1)                ! { dg-error "must be of numeric type, got TYPE" }
 !$omp end parallel
-!$omp parallel reduction (*:ta1)       ! { dg-error "is TYPE" }
+!$omp parallel reduction (*:ta1)       ! { dg-error "must be of numeric type, got TYPE" }
 !$omp end parallel
 !$omp parallel reduction (.and.:i3)    ! { dg-error "must be LOGICAL" }
 !$omp end parallel