diff options
| author | Giuliano Belinassi <giuliano.belinassi@usp.br> | 2020-08-22 17:43:43 -0300 |
|---|---|---|
| committer | Giuliano Belinassi <giuliano.belinassi@usp.br> | 2020-08-22 17:43:43 -0300 |
| commit | a926878ddbd5a98b272c22171ce58663fc04c3e0 (patch) | |
| tree | 86af256e5d9a9c06263c00adc90e5fe348008c43 /gcc/fortran/arith.c | |
| parent | 542730f087133690b47e036dfd43eb0db8a650ce (diff) | |
| parent | 07cbaed8ba7d1b6e4ab3a9f44175502a4e1ecdb1 (diff) | |
| download | gcc-devel/autopar_devel.zip gcc-devel/autopar_devel.tar.gz gcc-devel/autopar_devel.tar.bz2 | |
Merge branch 'autopar_rebase2' into autopar_develdevel/autopar_devel
Quickly commit changes in the rebase branch.
Diffstat (limited to 'gcc/fortran/arith.c')
| -rw-r--r-- | gcc/fortran/arith.c | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/gcc/fortran/arith.c b/gcc/fortran/arith.c index 422ef40..c4c1041 100644 --- a/gcc/fortran/arith.c +++ b/gcc/fortran/arith.c @@ -94,30 +94,29 @@ gfc_arith_error (arith code) switch (code) { case ARITH_OK: - p = _("Arithmetic OK at %L"); + p = G_("Arithmetic OK at %L"); break; case ARITH_OVERFLOW: - p = _("Arithmetic overflow at %L"); + p = G_("Arithmetic overflow at %L"); break; case ARITH_UNDERFLOW: - p = _("Arithmetic underflow at %L"); + p = G_("Arithmetic underflow at %L"); break; case ARITH_NAN: - p = _("Arithmetic NaN at %L"); + p = G_("Arithmetic NaN at %L"); break; case ARITH_DIV0: - p = _("Division by zero at %L"); + p = G_("Division by zero at %L"); break; case ARITH_INCOMMENSURATE: - p = _("Array operands are incommensurate at %L"); + p = G_("Array operands are incommensurate at %L"); break; case ARITH_ASYMMETRIC: - p = - _("Integer outside symmetric range implied by Standard Fortran at %L"); + p = G_("Integer outside symmetric range implied by Standard Fortran" + " at %L"); break; case ARITH_WRONGCONCAT: - p = - _("Illegal type in character concatenation at %L"); + p = G_("Illegal type in character concatenation at %L"); break; default: @@ -1388,7 +1387,7 @@ reduce_binary_aa (arith (*eval) (gfc_expr *, gfc_expr *, gfc_expr **), gfc_expr *r; arith rc = ARITH_OK; - if (!gfc_check_conformance (op1, op2, "elemental binary operation")) + if (!gfc_check_conformance (op1, op2, _("elemental binary operation"))) return ARITH_INCOMMENSURATE; head = gfc_constructor_copy (op1->value.constructor); @@ -1746,6 +1745,9 @@ eval_intrinsic_f3 (gfc_intrinsic_op op, gfc_expr *result; eval_f f; + if (!op1 && !op2) + return NULL; + result = reduce_binary0 (op1, op2); if (result != NULL) return eval_type_intrinsic0(op, result); |