diff options
| author | Janus Weil <janus@gcc.gnu.org> | 2009-08-13 21:46:46 +0200 |
|---|---|---|
| committer | Janus Weil <janus@gcc.gnu.org> | 2009-08-13 21:46:46 +0200 |
| commit | bc21d3152f7644fcbd2acf98adbba270c0408c91 (patch) | |
| tree | 7ca7b016aeb3b05df501fe81fe97a0e52abdc7b1 /gcc/fortran/misc.c | |
| parent | f100a4a841e1247f0ea73c93368306fb86f12954 (diff) | |
| download | gcc-bc21d3152f7644fcbd2acf98adbba270c0408c91.zip gcc-bc21d3152f7644fcbd2acf98adbba270c0408c91.tar.gz gcc-bc21d3152f7644fcbd2acf98adbba270c0408c91.tar.bz2 | |
re PR fortran/40941 (gfc_typespec: put derived and cl into union)
2009-08-13 Janus Weil <janus@gcc.gnu.org>
PR fortran/40941
* gfortran.h (gfc_typespec): Put 'derived' and 'cl' into union.
* decl.c (build_struct): Make sure 'cl' is only used
if type is BT_CHARACTER.
* symbol.c (gfc_set_default_type): Ditto.
* resolve.c (resolve_symbol, resolve_fl_derived): Ditto.
(resolve_equivalence,resolve_equivalence_derived): Make sure 'derived'
is only used if type is BT_DERIVED.
* trans-io.c (transfer_expr): Make sure 'derived' is only used if type
is BT_DERIVED or BT_INTEGER (special case: C_PTR/C_FUNPTR).
* array.c: Mechanical replacements to accomodate union in gfc_typespec.
* check.c: Ditto.
* data.c: Ditto.
* decl.c: Ditto.
* dump-parse-tree.c: Ditto.
* expr.c: Ditto.
* interface.c: Ditto.
* iresolve.c: Ditto.
* match.c: Ditto.
* misc.c: Ditto.
* module.c: Ditto.
* openmp.c: Ditto.
* parse.c: Ditto.
* primary.c: Ditto.
* resolve.c: Ditto.
* simplify.c: Ditto.
* symbol.c: Ditto.
* target-memory.c: Ditto.
* trans-array.c: Ditto.
* trans-common.c: Ditto.
* trans-const.c: Ditto.
* trans-decl.c: Ditto.
* trans-expr.c: Ditto.
* trans-intrinsic.c: Ditto.
* trans-io.c: Ditto.
* trans-stmt.c: Ditto.
* trans-types.c: Ditto.
From-SVN: r150725
Diffstat (limited to 'gcc/fortran/misc.c')
| -rw-r--r-- | gcc/fortran/misc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gcc/fortran/misc.c b/gcc/fortran/misc.c index 7e4b481..f80c9fa 100644 --- a/gcc/fortran/misc.c +++ b/gcc/fortran/misc.c @@ -67,9 +67,9 @@ void gfc_clear_ts (gfc_typespec *ts) { ts->type = BT_UNKNOWN; - ts->derived = NULL; + ts->u.derived = NULL; ts->kind = 0; - ts->cl = NULL; + ts->u.cl = NULL; ts->interface = NULL; ts->is_class = 0; /* flag that says if the type is C interoperable */ @@ -184,7 +184,7 @@ gfc_typename (gfc_typespec *ts) sprintf (buffer, "HOLLERITH"); break; case BT_DERIVED: - sprintf (buffer, "TYPE(%s)", ts->derived->name); + sprintf (buffer, "TYPE(%s)", ts->u.derived->name); break; case BT_PROCEDURE: strcpy (buffer, "PROCEDURE"); |