diff options
| author | Daniel Franke <franke.daniel@gmail.com> | 2009-06-07 09:45:47 -0400 |
|---|---|---|
| committer | Tobias Burnus <burnus@gcc.gnu.org> | 2009-06-07 15:45:47 +0200 |
| commit | ca8a87956aacfb2f74687734de9a5f20f86bf4fe (patch) | |
| tree | 75702351890b695bc6f6a150a48c7ea3895833aa /gcc/fortran/arith.c | |
| parent | 014583a13f592481bb6e4004607f2845cb4c7bc0 (diff) | |
| download | gcc-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/arith.c')
| -rw-r--r-- | gcc/fortran/arith.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gcc/fortran/arith.c b/gcc/fortran/arith.c index 17f2221..070e2bf 100644 --- a/gcc/fortran/arith.c +++ b/gcc/fortran/arith.c @@ -1561,7 +1561,7 @@ reduce_binary_aa (arith (*eval) (gfc_expr *, gfc_expr *, gfc_expr **), rc = ARITH_OK; d = op2->value.constructor; - if (gfc_check_conformance ("elemental binary operation", op1, op2) + if (gfc_check_conformance (op1, op2, "elemental binary operation") != SUCCESS) rc = ARITH_INCOMMENSURATE; else |