aboutsummaryrefslogtreecommitdiff
path: root/gcc/fortran/decl.c
diff options
context:
space:
mode:
authorThomas Koenig <tkoenig@gcc.gnu.org>2016-02-14 12:23:59 +0000
committerThomas Koenig <tkoenig@gcc.gnu.org>2016-02-14 12:23:59 +0000
commit60cb4ef5550eac9581ef1b36607b5fb297eddce2 (patch)
treec03f8e2995de5d99633664ea80baa6f1fa4665c4 /gcc/fortran/decl.c
parentcdc647c36f1a5878f8ea518c6865010abd9d7e69 (diff)
downloadgcc-60cb4ef5550eac9581ef1b36607b5fb297eddce2.zip
gcc-60cb4ef5550eac9581ef1b36607b5fb297eddce2.tar.gz
gcc-60cb4ef5550eac9581ef1b36607b5fb297eddce2.tar.bz2
re PR fortran/60526 (Accepts-invalid: Variable name same as type name)
2016-02-14 Thomas Koenig <tkoenig@gcc.gnu.org> PR fortran/60526 * decl.c (build_sym): If the name has already been defined as a type, issue error and return false. 2016-02-14 Thomas Koenig <tkoenig@gcc.gnu.org> PR fortran/60526 * gfortran.dg/type_decl_4.f90: New test. From-SVN: r233410
Diffstat (limited to 'gcc/fortran/decl.c')
-rw-r--r--gcc/fortran/decl.c20
1 files changed, 20 insertions, 0 deletions
diff --git a/gcc/fortran/decl.c b/gcc/fortran/decl.c
index df81369..a31ea49 100644
--- a/gcc/fortran/decl.c
+++ b/gcc/fortran/decl.c
@@ -1215,10 +1215,30 @@ build_sym (const char *name, gfc_charlen *cl, bool cl_deferred,
{
symbol_attribute attr;
gfc_symbol *sym;
+ int nlen;
+ char u_name[GFC_MAX_SYMBOL_LEN + 1];
+ gfc_symtree *st;
if (gfc_get_symbol (name, NULL, &sym))
return false;
+ /* Check if the name has already been defined as a type. The
+ first letter of the symtree will be in upper case then. */
+
+ nlen = strlen(name);
+ gcc_assert (nlen <= GFC_MAX_SYMBOL_LEN);
+ strncpy (u_name, name, nlen + 1);
+ u_name[0] = TOUPPER(u_name[0]);
+
+ st = gfc_find_symtree (gfc_current_ns->sym_root, u_name);
+
+ if (st != 0)
+ {
+ gfc_error ("Symbol %qs at %C also declared as a type at %L", name,
+ &st->n.sym->declared_at);
+ return false;
+ }
+
/* Start updating the symbol table. Add basic type attribute if present. */
if (current_ts.type != BT_UNKNOWN
&& (sym->attr.implicit_type == 0