aboutsummaryrefslogtreecommitdiff
path: root/gcc/fortran/resolve.c
diff options
context:
space:
mode:
authorDaniel Franke <franke.daniel@gmail.com>2009-06-07 09:45:47 -0400
committerTobias Burnus <burnus@gcc.gnu.org>2009-06-07 15:45:47 +0200
commitca8a87956aacfb2f74687734de9a5f20f86bf4fe (patch)
tree75702351890b695bc6f6a150a48c7ea3895833aa /gcc/fortran/resolve.c
parent014583a13f592481bb6e4004607f2845cb4c7bc0 (diff)
downloadgcc-ca8a87956aacfb2f74687734de9a5f20f86bf4fe.zip
gcc-ca8a87956aacfb2f74687734de9a5f20f86bf4fe.tar.gz
gcc-ca8a87956aacfb2f74687734de9a5f20f86bf4fe.tar.bz2
re PR fortran/36874 (Add shape checks to cshift/eoshift)
2009-06-07 Daniel Franke <franke.daniel@gmail.com> * check.c (dim_rank_check): Return SUCCESS if DIM=NULL. (gfc_check_lbound): Removed (now) redundant check for DIM=NULL. (gfc_check_minloc_maxloc): Likewise. (check_reduction): Likewise. (gfc_check_size): Likewise. (gfc_check_ubound): Likewise. (gfc_check_cshift): Added missing shape-conformance checks. (gfc_check_eoshift): Likewise. * gfortran.h (gfc_check_conformance): Modified prototype to printf-style. * expr.c (gfc_check_conformance): Accept error-message chunks in printf-style. Changed all callers. 2009-06-07 Daniel Franke <franke.daniel@gmail.com> PR fortran/36874 * gfortran.dg/intrinsic_argument_conformance_2.f90: Adjusted error message. * gfortran.dg/zero_sized_1.f90: Removed checks with incompatible shapes. * gfortran.dg/zero_sized_5.f90: Likewise. From-SVN: r148247
Diffstat (limited to 'gcc/fortran/resolve.c')
-rw-r--r--gcc/fortran/resolve.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c
index 8158b71..5bb38fe 100644
--- a/gcc/fortran/resolve.c
+++ b/gcc/fortran/resolve.c
@@ -1584,8 +1584,8 @@ resolve_elemental_actual (gfc_expr *expr, gfc_code *c)
/* Elemental procedure's array actual arguments must conform. */
if (e != NULL)
{
- if (gfc_check_conformance ("elemental procedure", arg->expr, e)
- == FAILURE)
+ if (gfc_check_conformance (arg->expr, e,
+ "elemental procedure") == FAILURE)
return FAILURE;
}
else