From bc21d3152f7644fcbd2acf98adbba270c0408c91 Mon Sep 17 00:00:00 2001 From: Janus Weil Date: Thu, 13 Aug 2009 21:46:46 +0200 Subject: re PR fortran/40941 (gfc_typespec: put derived and cl into union) 2009-08-13 Janus Weil 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 --- gcc/fortran/iresolve.c | 78 +++++++++++++++++++++++++------------------------- 1 file changed, 39 insertions(+), 39 deletions(-) (limited to 'gcc/fortran/iresolve.c') diff --git a/gcc/fortran/iresolve.c b/gcc/fortran/iresolve.c index 5bb24a4..1c180eb 100644 --- a/gcc/fortran/iresolve.c +++ b/gcc/fortran/iresolve.c @@ -62,16 +62,16 @@ gfc_get_string (const char *format, ...) static void check_charlen_present (gfc_expr *source) { - if (source->ts.cl == NULL) - source->ts.cl = gfc_new_charlen (gfc_current_ns); + if (source->ts.u.cl == NULL) + source->ts.u.cl = gfc_new_charlen (gfc_current_ns); if (source->expr_type == EXPR_CONSTANT) { - source->ts.cl->length = gfc_int_expr (source->value.character.length); + source->ts.u.cl->length = gfc_int_expr (source->value.character.length); source->rank = 0; } else if (source->expr_type == EXPR_ARRAY) - source->ts.cl->length = + source->ts.u.cl->length = gfc_int_expr (source->value.constructor->expr->value.character.length); } @@ -161,8 +161,8 @@ gfc_resolve_char_achar (gfc_expr *f, gfc_expr *x, gfc_expr *kind, f->ts.type = BT_CHARACTER; f->ts.kind = (kind == NULL) ? gfc_default_character_kind : mpz_get_si (kind->value.integer); - f->ts.cl = gfc_new_charlen (gfc_current_ns); - f->ts.cl->length = gfc_int_expr (1); + f->ts.u.cl = gfc_new_charlen (gfc_current_ns); + f->ts.u.cl->length = gfc_int_expr (1); f->value.function.name = gfc_get_string (name, f->ts.kind, gfc_type_letter (x->ts.type), @@ -651,8 +651,8 @@ gfc_resolve_ctime (gfc_expr *f, gfc_expr *time) { ts.type = BT_INTEGER; ts.kind = 8; - ts.derived = NULL; - ts.cl = NULL; + ts.u.derived = NULL; + ts.u.cl = NULL; gfc_convert_type (time, &ts, 2); } @@ -1058,8 +1058,8 @@ gfc_resolve_index_func (gfc_expr *f, gfc_expr *str, { ts.type = BT_LOGICAL; ts.kind = gfc_default_integer_kind; - ts.derived = NULL; - ts.cl = NULL; + ts.u.derived = NULL; + ts.u.cl = NULL; gfc_convert_type (back, &ts, 2); } @@ -1125,8 +1125,8 @@ gfc_resolve_isatty (gfc_expr *f, gfc_expr *u) { ts.type = BT_INTEGER; ts.kind = gfc_c_int_kind; - ts.derived = NULL; - ts.cl = NULL; + ts.u.derived = NULL; + ts.u.cl = NULL; gfc_convert_type (u, &ts, 2); } @@ -2175,8 +2175,8 @@ gfc_resolve_fgetc (gfc_expr *f, gfc_expr *u, gfc_expr *c ATTRIBUTE_UNUSED) { ts.type = BT_INTEGER; ts.kind = gfc_c_int_kind; - ts.derived = NULL; - ts.cl = NULL; + ts.u.derived = NULL; + ts.u.cl = NULL; gfc_convert_type (u, &ts, 2); } @@ -2205,8 +2205,8 @@ gfc_resolve_fputc (gfc_expr *f, gfc_expr *u, gfc_expr *c ATTRIBUTE_UNUSED) { ts.type = BT_INTEGER; ts.kind = gfc_c_int_kind; - ts.derived = NULL; - ts.cl = NULL; + ts.u.derived = NULL; + ts.u.cl = NULL; gfc_convert_type (u, &ts, 2); } @@ -2235,8 +2235,8 @@ gfc_resolve_ftell (gfc_expr *f, gfc_expr *u) { ts.type = BT_INTEGER; ts.kind = gfc_c_int_kind; - ts.derived = NULL; - ts.cl = NULL; + ts.u.derived = NULL; + ts.u.cl = NULL; gfc_convert_type (u, &ts, 2); } @@ -2341,16 +2341,16 @@ gfc_resolve_transfer (gfc_expr *f, gfc_expr *source ATTRIBUTE_UNUSED, static char transfer0[] = "__transfer0", transfer1[] = "__transfer1"; if (mold->ts.type == BT_CHARACTER - && !mold->ts.cl->length + && !mold->ts.u.cl->length && gfc_is_constant_expr (mold)) { int len; if (mold->expr_type == EXPR_CONSTANT) - mold->ts.cl->length = gfc_int_expr (mold->value.character.length); + mold->ts.u.cl->length = gfc_int_expr (mold->value.character.length); else { len = mold->value.constructor->expr->value.character.length; - mold->ts.cl->length = gfc_int_expr (len); + mold->ts.u.cl->length = gfc_int_expr (len); } } @@ -2498,8 +2498,8 @@ gfc_resolve_ttynam (gfc_expr *f, gfc_expr *unit) { ts.type = BT_INTEGER; ts.kind = gfc_c_int_kind; - ts.derived = NULL; - ts.cl = NULL; + ts.u.derived = NULL; + ts.u.cl = NULL; gfc_convert_type (unit, &ts, 2); } @@ -3077,8 +3077,8 @@ gfc_resolve_ctime_sub (gfc_code *c) { ts.type = BT_INTEGER; ts.kind = 8; - ts.derived = NULL; - ts.cl = NULL; + ts.u.derived = NULL; + ts.u.cl = NULL; gfc_convert_type (c->ext.actual->expr, &ts, 2); } @@ -3180,8 +3180,8 @@ gfc_resolve_fgetc_sub (gfc_code *c) { ts.type = BT_INTEGER; ts.kind = gfc_c_int_kind; - ts.derived = NULL; - ts.cl = NULL; + ts.u.derived = NULL; + ts.u.cl = NULL; gfc_convert_type (u, &ts, 2); } @@ -3225,8 +3225,8 @@ gfc_resolve_fputc_sub (gfc_code *c) { ts.type = BT_INTEGER; ts.kind = gfc_c_int_kind; - ts.derived = NULL; - ts.cl = NULL; + ts.u.derived = NULL; + ts.u.cl = NULL; gfc_convert_type (u, &ts, 2); } @@ -3274,8 +3274,8 @@ gfc_resolve_fseek_sub (gfc_code *c) { ts.type = BT_INTEGER; ts.kind = gfc_c_int_kind; - ts.derived = NULL; - ts.cl = NULL; + ts.u.derived = NULL; + ts.u.cl = NULL; gfc_convert_type (unit, &ts, 2); } @@ -3283,8 +3283,8 @@ gfc_resolve_fseek_sub (gfc_code *c) { ts.type = BT_INTEGER; ts.kind = gfc_intio_kind; - ts.derived = NULL; - ts.cl = NULL; + ts.u.derived = NULL; + ts.u.cl = NULL; gfc_convert_type (offset, &ts, 2); } @@ -3292,8 +3292,8 @@ gfc_resolve_fseek_sub (gfc_code *c) { ts.type = BT_INTEGER; ts.kind = gfc_c_int_kind; - ts.derived = NULL; - ts.cl = NULL; + ts.u.derived = NULL; + ts.u.cl = NULL; gfc_convert_type (whence, &ts, 2); } @@ -3316,8 +3316,8 @@ gfc_resolve_ftell_sub (gfc_code *c) { ts.type = BT_INTEGER; ts.kind = gfc_c_int_kind; - ts.derived = NULL; - ts.cl = NULL; + ts.u.derived = NULL; + ts.u.cl = NULL; gfc_convert_type (unit, &ts, 2); } @@ -3336,8 +3336,8 @@ gfc_resolve_ttynam_sub (gfc_code *c) { ts.type = BT_INTEGER; ts.kind = gfc_c_int_kind; - ts.derived = NULL; - ts.cl = NULL; + ts.u.derived = NULL; + ts.u.cl = NULL; gfc_convert_type (c->ext.actual->expr, &ts, 2); } -- cgit v1.1