2005-01-22 Paul Brook <paul@codesourcery.com>
+ * gfortran.h (gfc_check_access): Add prototype.
+ * match.c (gfc_match_namelist): Remove TODO.
+ * module.c (check_access): Rename ...
+ (gfc_check_access): ... to this. Boolify. Update callers.
+ * resolve.c (resolve_symbol): Check for private objects in public
+ namelists.
+
+2005-01-22 Paul Brook <paul@codesourcery.com>
+
* primary.c (gfc_match_rvalue): Only apply implicit type if variable
does not have an explicit type.
(gfc_match_variable): Resolve implicit derived types in all cases.
/* Given an access type that is specific to an entity and the default
- access, return nonzero if we should write the entity. */
+ access, return nonzero if the entity is publicly accessible. */
-static int
-check_access (gfc_access specific_access, gfc_access default_access)
+bool
+gfc_check_access (gfc_access specific_access, gfc_access default_access)
{
if (specific_access == ACCESS_PUBLIC)
- return 1;
+ return TRUE;
if (specific_access == ACCESS_PRIVATE)
- return 0;
+ return FALSE;
if (gfc_option.flag_module_access_private)
- {
- if (default_access == ACCESS_PUBLIC)
- return 1;
- }
+ return default_access == ACCESS_PUBLIC;
else
- {
- if (default_access != ACCESS_PRIVATE)
- return 1;
- }
+ return default_access != ACCESS_PRIVATE;
- return 0;
+ return FALSE;
}
&& !sym->attr.subroutine && !sym->attr.function)
return;
- if (!check_access (sym->attr.access, sym->ns->default_access))
+ if (!gfc_check_access (sym->attr.access, sym->ns->default_access))
return;
p = get_pointer (sym);
static char nullstring[] = "";
if (uop->operator == NULL
- || !check_access (uop->access, uop->ns->default_access))
+ || !gfc_check_access (uop->access, uop->ns->default_access))
return;
mio_symbol_interface (uop->name, nullstring, &uop->operator);
{
if (sym->generic == NULL
- || !check_access (sym->attr.access, sym->ns->default_access))
+ || !gfc_check_access (sym->attr.access, sym->ns->default_access))
return;
mio_symbol_interface (sym->name, sym->module, &sym->generic);
pointer_info *p;
sym = st->n.sym;
- if (!check_access (sym->attr.access, sym->ns->default_access)
+ if (!gfc_check_access (sym->attr.access, sym->ns->default_access)
|| (sym->attr.flavor == FL_PROCEDURE && sym->attr.generic
&& !sym->attr.subroutine && !sym->attr.function))
return;
if (i == INTRINSIC_USER)
continue;
- mio_interface (check_access (gfc_current_ns->operator_access[i],
- gfc_current_ns->default_access)
+ mio_interface (gfc_check_access (gfc_current_ns->operator_access[i],
+ gfc_current_ns->default_access)
? &gfc_current_ns->operator[i] : NULL);
}
int formal_ns_save, check_constant, mp_flag;
int i;
const char *whynot;
-
+ gfc_namelist *nl;
if (sym->attr.flavor == FL_UNKNOWN)
{
}
}
- if (sym->attr.flavor == FL_VARIABLE)
+ switch (sym->attr.flavor)
{
+ case FL_VARIABLE:
/* Can the sybol have an initializer? */
whynot = NULL;
if (sym->attr.allocatable)
/* Assign default initializer. */
if (sym->ts.type == BT_DERIVED && !(sym->value || whynot))
sym->value = gfc_default_initializer (&sym->ts);
+ break;
+
+ case FL_NAMELIST:
+ /* Reject PRIVATE objects in a PUBLIC namelist. */
+ if (gfc_check_access(sym->attr.access, sym->ns->default_access))
+ {
+ for (nl = sym->namelist; nl; nl = nl->next)
+ {
+ if (!gfc_check_access(nl->sym->attr.access,
+ nl->sym->ns->default_access))
+ gfc_error ("PRIVATE symbol '%s' cannot be member of "
+ "PUBLIC namelist at %L", nl->sym->name,
+ &sym->declared_at);
+ }
+ }
+ break;
+
+ default:
+ break;
}