aboutsummaryrefslogtreecommitdiff
path: root/gcc/fortran/resolve.c
diff options
context:
space:
mode:
authorTobias Burnus <burnus@net-b.de>2015-12-09 20:29:46 +0100
committerTobias Burnus <burnus@gcc.gnu.org>2015-12-09 20:29:46 +0100
commit811582ec147f4eb722b75578faba4a94c5cfd829 (patch)
tree6aca1041926ede1a67f736435d11018ecdd9644e /gcc/fortran/resolve.c
parent1326155711cd4af6bdbf347b51e2a7337cf07414 (diff)
downloadgcc-811582ec147f4eb722b75578faba4a94c5cfd829.zip
gcc-811582ec147f4eb722b75578faba4a94c5cfd829.tar.gz
gcc-811582ec147f4eb722b75578faba4a94c5cfd829.tar.bz2
re PR fortran/68815 (Error/warning diagnostic: '%s' should be converted to %qs-like or %<%s%>-like string strings)
2015-12-09 Tobias Burnus <burnus@net-b.de> PR fortran/68815 * decl.c (gfc_verify_c_interop_param, variable_decl): Use %< ... %> for quoting in diagnostics. * io.c (check_format): Ditto. * resolve.c (resolve_operator): Ditto. * symbol.c (check_conflict): Ditto. * trans-common.c (translate_common): Ditto. From-SVN: r231472
Diffstat (limited to 'gcc/fortran/resolve.c')
-rw-r--r--gcc/fortran/resolve.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c
index 10add62..65a2b7f 100644
--- a/gcc/fortran/resolve.c
+++ b/gcc/fortran/resolve.c
@@ -3560,7 +3560,7 @@ resolve_operator (gfc_expr *e)
break;
}
- sprintf (msg, _("Operand of unary numeric operator '%s' at %%L is %s"),
+ sprintf (msg, _("Operand of unary numeric operator %%<%s%%> at %%L is %s"),
gfc_op2string (e->value.op.op), gfc_typename (&e->ts));
goto bad_op;
@@ -3576,7 +3576,7 @@ resolve_operator (gfc_expr *e)
}
sprintf (msg,
- _("Operands of binary numeric operator '%s' at %%L are %s/%s"),
+ _("Operands of binary numeric operator %%<%s%%> at %%L are %s/%s"),
gfc_op2string (e->value.op.op), gfc_typename (&op1->ts),
gfc_typename (&op2->ts));
goto bad_op;
@@ -3610,7 +3610,7 @@ resolve_operator (gfc_expr *e)
break;
}
- sprintf (msg, _("Operands of logical operator '%s' at %%L are %s/%s"),
+ sprintf (msg, _("Operands of logical operator %%<%s%%> at %%L are %s/%s"),
gfc_op2string (e->value.op.op), gfc_typename (&op1->ts),
gfc_typename (&op2->ts));
@@ -3695,7 +3695,7 @@ resolve_operator (gfc_expr *e)
? ".eqv." : ".neqv.", gfc_op2string (e->value.op.op));
else
sprintf (msg,
- _("Operands of comparison operator '%s' at %%L are %s/%s"),
+ _("Operands of comparison operator %%<%s%%> at %%L are %s/%s"),
gfc_op2string (e->value.op.op), gfc_typename (&op1->ts),
gfc_typename (&op2->ts));
@@ -3703,13 +3703,14 @@ resolve_operator (gfc_expr *e)
case INTRINSIC_USER:
if (e->value.op.uop->op == NULL)
- sprintf (msg, _("Unknown operator '%s' at %%L"), e->value.op.uop->name);
+ sprintf (msg, _("Unknown operator %%<%s%%> at %%L"),
+ e->value.op.uop->name);
else if (op2 == NULL)
- sprintf (msg, _("Operand of user operator '%s' at %%L is %s"),
+ sprintf (msg, _("Operand of user operator %%<%s%%> at %%L is %s"),
e->value.op.uop->name, gfc_typename (&op1->ts));
else
{
- sprintf (msg, _("Operands of user operator '%s' at %%L are %s/%s"),
+ sprintf (msg, _("Operands of user operator %%<%s%%> at %%L are %s/%s"),
e->value.op.uop->name, gfc_typename (&op1->ts),
gfc_typename (&op2->ts));
e->value.op.uop->op->sym->attr.referenced = 1;