From a4d9b2212cbf2912387c215da744c217de80f5d2 Mon Sep 17 00:00:00 2001 From: Tobias Burnus Date: Sat, 13 Dec 2014 00:12:06 +0100 Subject: error.c (gfc_error): Add variant which takes a va_list. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 2014-12-13 Tobias Burnus Manuel López-Ibáñez fortran/ * error.c (gfc_error): Add variant which takes a va_list. (gfc_notify_std): Convert to common diagnostic. * array.c: Use %qs, %<...%> in more gfc_error calls and for gfc_notify_std. * check.c: Ditto. * data.c: Ditto. * decl.c: Ditto. * expr.c: Ditto. * interface.c: Ditto. * intrinsic.c: Ditto. * io.c: Ditto. * match.c: Ditto. * matchexp.c: Ditto. * module.c: Ditto. * openmp.c: Ditto. * parse.c: Ditto. * primary.c: Ditto. * resolve.c: Ditto. * simplify.c: Ditto. * symbol.c: Ditto. * trans-common.c: Ditto. * trans-intrinsic.c: Ditto. gcc/testsuite/ * gfortran.dg/realloc_on_assign_21.f90: Update dg-error. * gfortran.dg/warnings_are_errors_1.f: Ditto. * gfortran.dg/warnings_are_errors_1.f90: Ditto. Co-Authored-By: Manuel López-Ibáñez From-SVN: r218694 --- gcc/fortran/interface.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gcc/fortran/interface.c') diff --git a/gcc/fortran/interface.c b/gcc/fortran/interface.c index 5f6ed83..04bcf12 100644 --- a/gcc/fortran/interface.c +++ b/gcc/fortran/interface.c @@ -316,7 +316,7 @@ gfc_match_end_interface (void) if (current_interface.op == INTRINSIC_ASSIGN) { m = MATCH_ERROR; - gfc_error ("Expected 'END INTERFACE ASSIGNMENT (=)' at %C"); + gfc_error ("Expected % at %C"); } else { @@ -346,7 +346,7 @@ gfc_match_end_interface (void) break; m = MATCH_ERROR; - gfc_error ("Expecting 'END INTERFACE OPERATOR (%s)' at %C, " + gfc_error ("Expecting % at %C, " "but got %s", s1, s2); } @@ -360,7 +360,7 @@ gfc_match_end_interface (void) if (type != current_interface.type || strcmp (current_interface.uop->name, name) != 0) { - gfc_error ("Expecting 'END INTERFACE OPERATOR (.%s.)' at %C", + gfc_error ("Expecting % at %C", current_interface.uop->name); m = MATCH_ERROR; } @@ -371,7 +371,7 @@ gfc_match_end_interface (void) if (type != current_interface.type || strcmp (current_interface.sym->name, name) != 0) { - gfc_error ("Expecting 'END INTERFACE %s' at %C", + gfc_error ("Expecting % at %C", current_interface.sym->name); m = MATCH_ERROR; } @@ -1226,7 +1226,7 @@ check_dummy_characteristics (gfc_symbol *s1, gfc_symbol *s2, case -2: /* FIXME: Implement a warning for this case. - gfc_warning ("Possible shape mismatch in argument '%s'", + gfc_warning ("Possible shape mismatch in argument %qs", s1->name);*/ break; @@ -1589,7 +1589,7 @@ check_interface0 (gfc_interface *p, const char *interface_name) /* F2003, C1207. F2008, C1207. */ if (p->sym->attr.proc == PROC_INTERNAL && !gfc_notify_std (GFC_STD_F2008, "Internal procedure " - "'%s' in %s at %L", p->sym->name, + "%qs in %s at %L", p->sym->name, interface_name, &p->sym->declared_at)) return 1; } -- cgit v1.1