diff options
Diffstat (limited to 'gcc/fortran/trans-array.c')
| -rw-r--r-- | gcc/fortran/trans-array.c | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/gcc/fortran/trans-array.c b/gcc/fortran/trans-array.c index 6a2c2de..01c78d4 100644 --- a/gcc/fortran/trans-array.c +++ b/gcc/fortran/trans-array.c @@ -1341,6 +1341,7 @@ get_array_ctor_var_strlen (gfc_expr * expr, tree * len) { gfc_ref *ref; gfc_typespec *ts; + mpz_t char_len; /* Don't bother if we already know the length is a constant. */ if (*len && INTEGER_CST_P (*len)) @@ -1360,6 +1361,19 @@ get_array_ctor_var_strlen (gfc_expr * expr, tree * len) ts = &ref->u.c.component->ts; break; + case REF_SUBSTRING: + if (ref->u.ss.start->expr_type != EXPR_CONSTANT + || ref->u.ss.start->expr_type != EXPR_CONSTANT) + break; + mpz_init_set_ui (char_len, 1); + mpz_add (char_len, char_len, ref->u.ss.end->value.integer); + mpz_sub (char_len, char_len, ref->u.ss.start->value.integer); + *len = gfc_conv_mpz_to_tree (char_len, + gfc_default_character_kind); + *len = convert (gfc_charlen_type_node, *len); + mpz_clear (char_len); + return; + default: /* TODO: Substrings are tricky because we can't evaluate the expression more than once. For now we just give up, and hope @@ -4192,7 +4206,10 @@ gfc_conv_expr_descriptor (gfc_se * se, gfc_expr * expr, gfc_ss * ss) if (char_ref->type == REF_SUBSTRING) { mpz_t char_len; - expr->ts.cl = char_ref->u.ss.length; + expr->ts.cl = gfc_get_charlen (); + expr->ts.cl->next = char_ref->u.ss.length->next; + char_ref->u.ss.length->next = expr->ts.cl; + mpz_init_set_ui (char_len, 1); mpz_add (char_len, char_len, char_ref->u.ss.end->value.integer); |