From 92119f26f7b3b4cb611ef71d5d786c9960434440 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tobias=20Schl=C3=BCter?= Date: Tue, 1 Nov 2005 21:05:54 +0100 Subject: [PATCH] re PR fortran/24404 (Poor Error Description, bad error order) PR fortran/24404 * resolve.c (resolve_symbol): Output symbol names in more error messages, clarify error message. From-SVN: r106346 --- gcc/fortran/ChangeLog | 6 ++++++ gcc/fortran/resolve.c | 20 ++++++++++---------- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 6e7f5843659..d40dff57e5e 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,9 @@ +2005-11-01 Tobias Schl"uter + + PR fortran/24404 + * resolve.c (resolve_symbol): Output symbol names in more error + messages, clarify error message. + 2005-11-01 Tobias Schl"uter * dump-parse-tree.c (show_symtree): Revert change unintentionally diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c index 5d5ca780ba7..6db0f1e6a44 100644 --- a/gcc/fortran/resolve.c +++ b/gcc/fortran/resolve.c @@ -4432,18 +4432,18 @@ resolve_symbol (gfc_symbol * sym) if (sym->attr.allocatable) { if (sym->attr.dimension) - gfc_error ("Allocatable array at %L must have a deferred shape", - &sym->declared_at); + gfc_error ("Allocatable array '%s' at %L must have " + "a deferred shape", sym->name, &sym->declared_at); else - gfc_error ("Object at %L may not be ALLOCATABLE", - &sym->declared_at); + gfc_error ("Scalar object '%s' at %L may not be ALLOCATABLE", + sym->name, &sym->declared_at); return; } if (sym->attr.pointer && sym->attr.dimension) { - gfc_error ("Pointer to array at %L must have a deferred shape", - &sym->declared_at); + gfc_error ("Array pointer '%s' at %L must have a deferred shape", + sym->name, &sym->declared_at); return; } @@ -4453,8 +4453,8 @@ resolve_symbol (gfc_symbol * sym) if (!mp_flag && !sym->attr.allocatable && !sym->attr.pointer && !sym->attr.dummy) { - gfc_error ("Array at %L cannot have a deferred shape", - &sym->declared_at); + gfc_error ("Array '%s' at %L cannot have a deferred shape", + sym->name, &sym->declared_at); return; } } @@ -4538,8 +4538,8 @@ resolve_symbol (gfc_symbol * sym) /* An external symbol falls through to here if it is not referenced. */ if (sym->attr.external && sym->value) { - gfc_error ("External object at %L may not have an initializer", - &sym->declared_at); + gfc_error ("External object '%s' at %L may not have an initializer", + sym->name, &sym->declared_at); return; } -- 2.30.2