diff options
| author | pault <pault@138bc75d-0d04-0410-961f-82ee72b054a4> | 2008-01-20 08:22:56 +0000 |
|---|---|---|
| committer | pault <pault@138bc75d-0d04-0410-961f-82ee72b054a4> | 2008-01-20 08:22:56 +0000 |
| commit | f1ce7f3e1e87543427f10979a133863c18fa51cf (patch) | |
| tree | 9d64879d44fe6ed386e45de8c13efc7841555948 /gcc/fortran/trans-array.c | |
| parent | 06398a9da96e23291ffa797b38555cdaa5be23e3 (diff) | |
| download | gcc-f1ce7f3e1e87543427f10979a133863c18fa51cf.tar.gz | |
2008-01-20 Paul Thomas <pault@gcc.gnu.org>
PR fortran/34784
* array.c (gfc_check_constructor_type): Clear the expression ts
so that the checking starts from the deepest level of array
constructor.
* primary.c (match_varspec): If an unknown type is changed to
default character and the attempt to match a substring fails,
change it back to unknown.
PR fortran/34785
* trans-array.c (gfc_add_loop_ss_code) : If ss->string_length is
NULL for an array constructor, use the cl.length expression to
build it.
(gfc_conv_array_parameter): Change call to gfc_evaluate_now to
a tree assignment.
2008-01-20 Paul Thomas <pault@gcc.gnu.org>
PR fortran/34784
* gfortran.dg/array_constructor_20.f90: New test.
* gfortran.dg/mapping_2.f90: Correct ubound expression for h4.
PR fortran/34785
* gfortran.dg/array_constructor_21.f90: New test.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@131675 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/fortran/trans-array.c')
| -rw-r--r-- | gcc/fortran/trans-array.c | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/gcc/fortran/trans-array.c b/gcc/fortran/trans-array.c index 1718ba9cfae..08c2a80d85c 100644 --- a/gcc/fortran/trans-array.c +++ b/gcc/fortran/trans-array.c @@ -1906,6 +1906,18 @@ gfc_add_loop_ss_code (gfc_loopinfo * loop, gfc_ss * ss, bool subscript) break; case GFC_SS_CONSTRUCTOR: + if (ss->expr->ts.type == BT_CHARACTER + && ss->string_length== NULL + && ss->expr->ts.cl + && ss->expr->ts.cl->length) + { + gfc_init_se (&se, NULL); + gfc_conv_expr_type (&se, ss->expr->ts.cl->length, + gfc_charlen_type_node); + ss->string_length = se.expr; + gfc_add_block_to_block (&loop->pre, &se.pre); + gfc_add_block_to_block (&loop->post, &se.post); + } gfc_trans_array_constructor (loop, ss); break; @@ -5042,7 +5054,7 @@ gfc_conv_array_parameter (gfc_se * se, gfc_expr * expr, gfc_ss * ss, int g77) { get_array_ctor_strlen (&se->pre, expr->value.constructor, &tmp); expr->ts.cl->backend_decl = tmp; - se->string_length = gfc_evaluate_now (tmp, &se->pre); + se->string_length = tmp; } /* Is this the result of the enclosing procedure? */ |