diff options
| author | Janus Weil <janus@gcc.gnu.org> | 2010-05-30 23:56:11 +0200 |
|---|---|---|
| committer | Janus Weil <janus@gcc.gnu.org> | 2010-05-30 23:56:11 +0200 |
| commit | 7a08eda1619ac02b31ff4bcf8582a94237424132 (patch) | |
| tree | bd664a3b4e0b3ba3499bd2892841cf41c6b4a076 /gcc/fortran/decl.c | |
| parent | 66a3e33967b012b5ec524c0c57618fe7408ce440 (diff) | |
| download | gcc-7a08eda1619ac02b31ff4bcf8582a94237424132.zip gcc-7a08eda1619ac02b31ff4bcf8582a94237424132.tar.gz gcc-7a08eda1619ac02b31ff4bcf8582a94237424132.tar.bz2 | |
gfortran.h (CLASS_DATA): New macro for accessing the $data component of a class container.
2010-05-30 Janus Weil <janus@gcc.gnu.org>
* gcc/fortran/gfortran.h (CLASS_DATA): New macro for accessing the
$data component of a class container.
* gcc/fortran/decl.c (attr_decl1): Use macro CLASS_DATA.
* gcc/fortran/expr.c (gfc_check_pointer_assign,gfc_check_assign_symbol,
gfc_has_ultimate_allocatable,gfc_has_ultimate_pointer): Ditto.
* gcc/fortran/interface.c (matching_typebound_op): Ditto.
* gcc/fortran/match.c (gfc_match_allocate, gfc_match_deallocate): Ditto.
* gcc/fortran/parse.c (parse_derived): Ditto.
* gcc/fortran/primary.c (gfc_match_varspec, gfc_variable_attr,
gfc_expr_attr): Ditto.
* gcc/fortran/resolve.c (resolve_structure_cons, find_array_spec,
resolve_deallocate_expr, resolve_allocate_expr, resolve_select_type,
resolve_fl_var_and_proc, resolve_typebound_procedure,
resolve_fl_derived): Ditto.
* gcc/fortran/symbol.c (gfc_type_compatible): Restructured.
* gcc/fortran/trans-array.c (structure_alloc_comps): Use macro
CLASS_DATA.
* gcc/fortran/trans-decl.c (gfc_get_symbol_decl,
gfc_trans_deferred_vars): Ditto.
* gcc/fortran/trans-stmt.c (gfc_trans_allocate): Ditto.
From-SVN: r160060
Diffstat (limited to 'gcc/fortran/decl.c')
| -rw-r--r-- | gcc/fortran/decl.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/gcc/fortran/decl.c b/gcc/fortran/decl.c index 12dcf84..9786a860 100644 --- a/gcc/fortran/decl.c +++ b/gcc/fortran/decl.c @@ -5755,19 +5755,16 @@ attr_decl1 (void) /* Update symbol table. DIMENSION attribute is set in gfc_set_array_spec(). For CLASS variables, this must be applied to the first component, or '$data' field. */ - if (sym->ts.type == BT_CLASS && sym->ts.u.derived) + if (sym->ts.type == BT_CLASS) { - gfc_component *comp; - comp = gfc_find_component (sym->ts.u.derived, "$data", true, true); - if (comp == NULL || gfc_copy_attr (&comp->attr, ¤t_attr, - &var_locus) == FAILURE) + if (gfc_copy_attr (&CLASS_DATA (sym)->attr, ¤t_attr,&var_locus) + == FAILURE) { m = MATCH_ERROR; goto cleanup; } - sym->attr.class_ok = (sym->attr.class_ok - || current_attr.allocatable - || current_attr.pointer); + sym->attr.class_ok = (sym->attr.class_ok || current_attr.allocatable + || current_attr.pointer); } else { |