diff options
| author | Paul Thomas <pault@gcc.gnu.org> | 2008-01-30 06:56:10 +0000 |
|---|---|---|
| committer | Paul Thomas <pault@gcc.gnu.org> | 2008-01-30 06:56:10 +0000 |
| commit | a99d95a270cabbbf43024c32ac6225da13e4aad1 (patch) | |
| tree | 0114132c0dd451283cabb7a4b589fc60b10dae25 /gcc/fortran/module.c | |
| parent | 7ae252ab69e5498454d5ef1592eabd503353d17e (diff) | |
| download | gcc-a99d95a270cabbbf43024c32ac6225da13e4aad1.zip gcc-a99d95a270cabbbf43024c32ac6225da13e4aad1.tar.gz gcc-a99d95a270cabbbf43024c32ac6225da13e4aad1.tar.bz2 | |
re PR fortran/34975 (Bogus error with USEing modules)
2008-01-30 Paul Thomas <pault@gcc.gnu.org>
PR fortran/34975
* symbol.c (gfc_delete_symtree, gfc_undo_symbols): Rename
delete_symtree to gfc_delete_symtree.
* gfortran.h : Add prototype for gfc_delete_symtree.
* module.c (load_generic_interfaces): Transfer symbol to a
unique symtree and delete old symtree, instead of renaming.
(read_module): The rsym and the found symbol are the same, so
the found symtree can be deleted.
PR fortran/34429
* decl.c (match_char_spec): Remove the constraint on deferred
matching of functions and free the length expression.
delete_symtree to gfc_delete_symtree.
(gfc_match_type_spec): Whitespace.
(gfc_match_function_decl): Defer characteristic association for
all types except BT_UNKNOWN.
* parse.c (decode_specification_statement): Only derived type
function matching is delayed to the end of specification.
2008-01-30 Paul Thomas <pault@gcc.gnu.org>
PR fortran/34975
* gfortran.dg/use_only_3.f90: New test.
* gfortran.dg/use_only_3.inc: Modules for new test.
PR fortran/34429
* gfortran.dg/function_charlen_2.f90: New test.
From-SVN: r131956
Diffstat (limited to 'gcc/fortran/module.c')
| -rw-r--r-- | gcc/fortran/module.c | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/gcc/fortran/module.c b/gcc/fortran/module.c index c2dc27a..b478d3e 100644 --- a/gcc/fortran/module.c +++ b/gcc/fortran/module.c @@ -3308,13 +3308,19 @@ load_generic_interfaces (void) if (!sym) { - /* Make symtree inaccessible by renaming if the symbol has - been added by a USE statement without an ONLY(11.3.2). */ + /* Make the symbol inaccessible if it has been added by a USE + statement without an ONLY(11.3.2). */ if (st && only_flag && !st->n.sym->attr.use_only && !st->n.sym->attr.use_rename && strcmp (st->n.sym->module, module_name) == 0) - st->name = gfc_get_string ("hidden.%s", name); + { + sym = st->n.sym; + gfc_delete_symtree (&gfc_current_ns->sym_root, name); + st = gfc_get_unique_symtree (gfc_current_ns); + st->n.sym = sym; + sym = NULL; + } else if (st) { sym = st->n.sym; @@ -3733,21 +3739,21 @@ read_module (void) { st = gfc_find_symtree (gfc_current_ns->sym_root, name); - /* Make symtree inaccessible by renaming if the symbol has - been added by a USE statement without an ONLY(11.3.2). */ + /* Delete the symtree if the symbol has been added by a USE + statement without an ONLY(11.3.2). Remember that the rsym + will be the same as the symbol found in the symtree, for + this case.*/ if (st && (only_flag || info->u.rsym.renamed) && !st->n.sym->attr.use_only && !st->n.sym->attr.use_rename - && st->n.sym->module - && strcmp (st->n.sym->module, module_name) == 0) - st->name = gfc_get_string ("hidden.%s", name); + && info->u.rsym.sym == st->n.sym) + gfc_delete_symtree (&gfc_current_ns->sym_root, name); /* Create a symtree node in the current namespace for this symbol. */ st = check_unique_name (p) ? gfc_get_unique_symtree (gfc_current_ns) : gfc_new_symtree (&gfc_current_ns->sym_root, p); - st->ambiguous = ambiguous; sym = info->u.rsym.sym; |