diff options
Diffstat (limited to 'gcc/fortran')
| -rw-r--r-- | gcc/fortran/ChangeLog | 10 | ||||
| -rw-r--r-- | gcc/fortran/array.c | 2 | ||||
| -rw-r--r-- | gcc/fortran/decl.c | 39 | ||||
| -rw-r--r-- | gcc/fortran/gfortran.h | 1 |
4 files changed, 50 insertions, 2 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 3831e7443e4..7a145fa2d49 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,13 @@ +2007-05-08 Paul Thomas <pault@gcc.gnu.org> + + PR fortran/29397 + PR fortran/29400 + * decl.c (add_init_expr_to_sym): Expand a scalar initializer + for a parameter array into an array expression with the right + shape. + * array.c (spec_dimen_size): Remove static attribute. + * gfortran.h : Prototype for spec_dimen_size. + 2007-05-07 Francois-Xavier Coudert <fxcoudert@gcc.gnu.org> PR fortran/31399 diff --git a/gcc/fortran/array.c b/gcc/fortran/array.c index 895bccc14d1..9359624efec 100644 --- a/gcc/fortran/array.c +++ b/gcc/fortran/array.c @@ -1714,7 +1714,7 @@ gfc_get_array_element (gfc_expr *array, int element) /* Get the size of single dimension of an array specification. The array is guaranteed to be one dimensional. */ -static try +try spec_dimen_size (gfc_array_spec *as, int dimen, mpz_t *result) { if (as == NULL) diff --git a/gcc/fortran/decl.c b/gcc/fortran/decl.c index 1dcc53dd067..0071f905611 100644 --- a/gcc/fortran/decl.c +++ b/gcc/fortran/decl.c @@ -974,7 +974,44 @@ add_init_expr_to_sym (const char *name, gfc_expr **initp, /* Add initializer. Make sure we keep the ranks sane. */ if (sym->attr.dimension && init->rank == 0) - init->rank = sym->as->rank; + { + mpz_t size; + gfc_expr *array; + gfc_constructor *c; + int n; + if (sym->attr.flavor == FL_PARAMETER + && init->expr_type == EXPR_CONSTANT + && spec_size (sym->as, &size) == SUCCESS + && mpz_cmp_si (size, 0) > 0) + { + array = gfc_start_constructor (init->ts.type, init->ts.kind, + &init->where); + + array->value.constructor = c = NULL; + for (n = 0; n < (int)mpz_get_si (size); n++) + { + if (array->value.constructor == NULL) + { + array->value.constructor = c = gfc_get_constructor (); + c->expr = init; + } + else + { + c->next = gfc_get_constructor (); + c = c->next; + c->expr = gfc_copy_expr (init); + } + } + + array->shape = gfc_get_shape (sym->as->rank); + for (n = 0; n < sym->as->rank; n++) + spec_dimen_size (sym->as, n, &array->shape[n]); + + init = array; + mpz_clear (size); + } + init->rank = sym->as->rank; + } sym->value = init; *initp = NULL; diff --git a/gcc/fortran/gfortran.h b/gcc/fortran/gfortran.h index df0896dd068..2030ec29bb2 100644 --- a/gcc/fortran/gfortran.h +++ b/gcc/fortran/gfortran.h @@ -2121,6 +2121,7 @@ void gfc_insert_constructor (gfc_expr *, gfc_constructor *); gfc_constructor *gfc_get_constructor (void); tree gfc_conv_array_initializer (tree type, gfc_expr * expr); try spec_size (gfc_array_spec *, mpz_t *); +try spec_dimen_size (gfc_array_spec *, int, mpz_t *); int gfc_is_compile_time_shape (gfc_array_spec *); /* interface.c -- FIXME: some of these should be in symbol.c */ |