Commit 92119f26 by Tobias Schlüter Committed by Tobias Schlüter

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
parent 8a82b045
2005-11-01 Tobias Schl"uter <tobias.schlueter@physik.uni-muenchen.de> 2005-11-01 Tobias Schl"uter <tobias.schlueter@physik.uni-muenchen.de>
PR fortran/24404
* resolve.c (resolve_symbol): Output symbol names in more error
messages, clarify error message.
2005-11-01 Tobias Schl"uter <tobias.schlueter@physik.uni-muenchen.de>
* dump-parse-tree.c (show_symtree): Revert change unintentionally * dump-parse-tree.c (show_symtree): Revert change unintentionally
committed in r106246. committed in r106246.
......
...@@ -4432,18 +4432,18 @@ resolve_symbol (gfc_symbol * sym) ...@@ -4432,18 +4432,18 @@ resolve_symbol (gfc_symbol * sym)
if (sym->attr.allocatable) if (sym->attr.allocatable)
{ {
if (sym->attr.dimension) if (sym->attr.dimension)
gfc_error ("Allocatable array at %L must have a deferred shape", gfc_error ("Allocatable array '%s' at %L must have "
&sym->declared_at); "a deferred shape", sym->name, &sym->declared_at);
else else
gfc_error ("Object at %L may not be ALLOCATABLE", gfc_error ("Scalar object '%s' at %L may not be ALLOCATABLE",
&sym->declared_at); sym->name, &sym->declared_at);
return; return;
} }
if (sym->attr.pointer && sym->attr.dimension) if (sym->attr.pointer && sym->attr.dimension)
{ {
gfc_error ("Pointer to array at %L must have a deferred shape", gfc_error ("Array pointer '%s' at %L must have a deferred shape",
&sym->declared_at); sym->name, &sym->declared_at);
return; return;
} }
...@@ -4453,8 +4453,8 @@ resolve_symbol (gfc_symbol * sym) ...@@ -4453,8 +4453,8 @@ resolve_symbol (gfc_symbol * sym)
if (!mp_flag && !sym->attr.allocatable if (!mp_flag && !sym->attr.allocatable
&& !sym->attr.pointer && !sym->attr.dummy) && !sym->attr.pointer && !sym->attr.dummy)
{ {
gfc_error ("Array at %L cannot have a deferred shape", gfc_error ("Array '%s' at %L cannot have a deferred shape",
&sym->declared_at); sym->name, &sym->declared_at);
return; return;
} }
} }
...@@ -4538,8 +4538,8 @@ resolve_symbol (gfc_symbol * sym) ...@@ -4538,8 +4538,8 @@ resolve_symbol (gfc_symbol * sym)
/* An external symbol falls through to here if it is not referenced. */ /* An external symbol falls through to here if it is not referenced. */
if (sym->attr.external && sym->value) if (sym->attr.external && sym->value)
{ {
gfc_error ("External object at %L may not have an initializer", gfc_error ("External object '%s' at %L may not have an initializer",
&sym->declared_at); sym->name, &sym->declared_at);
return; return;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment