From 0a7183f6d173cbd69025a3deb30d16f91e6392b2 Mon Sep 17 00:00:00 2001 From: Mark Eggleston Date: Tue, 2 Jun 2020 08:38:01 +0100 Subject: Fortran : Fortran translation issues PR52279 Mark strings for translation by enclosing in G_() and _(). 2020-06-24 Mark Eggleston gcc/fortran/ PR fortran/52279 * arith.c (reduce_binary_aa): Mark for translation the string parameter to gfc_check_conformance with G_(). * check.c (gfc_invalid_boz): Mark hint for translation using _(). (gfc_check_achar): Mark for translation the message parameter to gfc_invalid_boz using G_(). (gfc_check_char): Mark for translation the message parameter to gfc_invalid_boz using G_(). (gfc_check_complex): Mark for translation the message parameter to gfc_invalid_boz using G_(). (gfc_check_float): Mark for translation the message parameter to gfc_invalid_boz using G_(). (check_rest): Mark for translation the string parameter to gfc_check_conformance with _(). (gfc_check_minloc_maxloc): Mark for translation the string parameter to gfc_check_conformance with _(). (gfc_check_findloc): Mark for translation the string parameter to gfc_check_conformance with _(). (check_reduction): Mark for translation the string parameter to gfc_check_conformance with _(). (gfc_check_pack): Mark for translation the string parameter to gfc_check_conformance with _(). * decl.c (match_old_style_init): Mark for translation the message parameter to gfc_invalid_boz using G_(). * expr.c (gfc_check_assign): Mark for translation the string parameter to gfc_check_conformance with _(). * intrinsic.c (check_specific): Mark for translation the string parameter to gfc_check_conformance with _(). (gfc_check_intrinsic_standard): Mark symstd_msg strings for translation using G_(). No need to mark symstd_msg for translation in call to gfc_warning or when setting symstd. * io.c (check_open_constraints): Mark strings for translation using G_() in all calls to warn_or_error. (match_io_element): Mark for translation the message parameter to gfc_invalid_boz using G_(). * primary.c (match_boz_constant): Mark for translation the message parameter to gfc_invalid_boz using G_(). * resolve.c (resolve_elemental_actual): Mark for translation the string parameter to gfc_check_conformance with _(). (resolve_operator): Mark for translation the string parameter to gfc_check_conformance with _(). Mark translation strings assigned to msg using G_() for use in a call to cfg_warning. --- gcc/fortran/resolve.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'gcc/fortran/resolve.c') diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c index 2a16405..1952b53 100644 --- a/gcc/fortran/resolve.c +++ b/gcc/fortran/resolve.c @@ -2315,7 +2315,7 @@ resolve_elemental_actual (gfc_expr *expr, gfc_code *c) /* Elemental procedure's array actual arguments must conform. */ if (e != NULL) { - if (!gfc_check_conformance (arg->expr, e, "elemental procedure")) + if (!gfc_check_conformance (arg->expr, e, _("elemental procedure"))) return false; } else @@ -4190,9 +4190,9 @@ resolve_operator (gfc_expr *e) /* If op1 is BOZ, then op2 is not!. Try to convert to type of op2. */ if (op1->ts.type == BT_BOZ) { - if (gfc_invalid_boz ("BOZ literal constant near %L cannot appear as " - "an operand of a relational operator", - &op1->where)) + if (gfc_invalid_boz (G_("BOZ literal constant near %L cannot appear " + "as an operand of a relational operator"), + &op1->where)) return false; if (op2->ts.type == BT_INTEGER && !gfc_boz2int (op1, op2->ts.kind)) @@ -4205,8 +4205,8 @@ resolve_operator (gfc_expr *e) /* If op2 is BOZ, then op1 is not!. Try to convert to type of op2. */ if (op2->ts.type == BT_BOZ) { - if (gfc_invalid_boz ("BOZ literal constant near %L cannot appear as " - "an operand of a relational operator", + if (gfc_invalid_boz (G_("BOZ literal constant near %L cannot appear" + " as an operand of a relational operator"), &op2->where)) return false; @@ -4244,9 +4244,9 @@ resolve_operator (gfc_expr *e) const char *msg; if (op == INTRINSIC_EQ || op == INTRINSIC_EQ_OS) - msg = "Equality comparison for %s at %L"; + msg = G_("Equality comparison for %s at %L"); else - msg = "Inequality comparison for %s at %L"; + msg = G_("Inequality comparison for %s at %L"); gfc_warning (OPT_Wcompare_reals, msg, gfc_typename (op1), &op1->where); -- cgit v1.1