diff options
| author | Tobias Schlüter <tobias.schlueter@physik.uni-muenchen.de> | 2004-07-09 23:20:50 +0200 |
|---|---|---|
| committer | Tobias Schlüter <tobi@gcc.gnu.org> | 2004-07-09 23:20:50 +0200 |
| commit | 4077d207437b94a2d07d76c93b6583d5920bf7a8 (patch) | |
| tree | d3352c7a5ccff7412b5e6acf7f1978a0e40eb5b6 /gcc | |
| parent | 1f33f6b4c779919d3dd77be7001747a621de0e6a (diff) | |
| download | gcc-4077d207437b94a2d07d76c93b6583d5920bf7a8.zip gcc-4077d207437b94a2d07d76c93b6583d5920bf7a8.tar.gz gcc-4077d207437b94a2d07d76c93b6583d5920bf7a8.tar.bz2 | |
re PR fortran/13201 (PARAMETER variables of nonconstant shape are accepted)
PR fortran/13201
* resolve.c (resolve_symbol): Verify that the shape of a
parameter array is not only explicit, but also constant.
* array.c (gfc_is_compile_time_shape): New function.
* gfortran.h (gfc_is_compile_time_shape): Add prototype.
From-SVN: r84400
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/fortran/ChangeLog | 8 | ||||
| -rw-r--r-- | gcc/fortran/array.c | 19 | ||||
| -rw-r--r-- | gcc/fortran/gfortran.h | 1 | ||||
| -rw-r--r-- | gcc/fortran/resolve.c | 12 |
4 files changed, 35 insertions, 5 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index d5578cf..26182d4 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,4 +1,12 @@ 2004-07-09 Tobias Schlueter <tobias.schlueter@physik.uni-muenchen.de> + + PR fortran/13201 + * resolve.c (resolve_symbol): Verify that the shape of a + parameter array is not only explicit, but also constant. + * array.c (gfc_is_compile_time_shape): New function. + * gfortran.h (gfc_is_compile_time_shape): Add prototype. + +2004-07-09 Tobias Schlueter <tobias.schlueter@physik.uni-muenchen.de> PR fortran/15481 PR fortran/13372 diff --git a/gcc/fortran/array.c b/gcc/fortran/array.c index a7081d8..c7fc8bb 100644 --- a/gcc/fortran/array.c +++ b/gcc/fortran/array.c @@ -1973,3 +1973,22 @@ gfc_find_array_ref (gfc_expr * e) return &ref->u.ar; } + + +/* Find out if an array shape is known at compile time. */ + +int +gfc_is_compile_time_shape (gfc_array_spec *as) +{ + int i; + + if (as->type != AS_EXPLICIT) + return 0; + + for (i = 0; i < as->rank; i++) + if (!gfc_is_constant_expr (as->lower[i]) + || !gfc_is_constant_expr (as->upper[i])) + return 0; + + return 1; +} diff --git a/gcc/fortran/gfortran.h b/gcc/fortran/gfortran.h index 54508dc..d82d306 100644 --- a/gcc/fortran/gfortran.h +++ b/gcc/fortran/gfortran.h @@ -1645,6 +1645,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 *); +int gfc_is_compile_time_shape (gfc_array_spec *); /* interface.c -- FIXME: some of these should be in symbol.c */ void gfc_free_interface (gfc_interface *); diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c index a107095..81df9ef 100644 --- a/gcc/fortran/resolve.c +++ b/gcc/fortran/resolve.c @@ -3745,12 +3745,14 @@ resolve_symbol (gfc_symbol * sym) return; } - if (sym->attr.flavor == FL_PARAMETER - && sym->as != NULL && sym->as->type != AS_EXPLICIT) + /* A parameter array's shape needs to be constant. */ + + if (sym->attr.flavor == FL_PARAMETER && sym->as != NULL + && !gfc_is_compile_time_shape (sym->as)) { - gfc_error ("Parameter array '%s' at %L must have an explicit shape", - sym->name, &sym->declared_at); - return; + gfc_error ("Parameter array '%s' at %L cannot be automatic " + "or assumed shape", sym->name, &sym->declared_at); + return; } /* Make sure that character string variables with assumed length are |