diff options
| author | Tobias Burnus <burnus@net-b.de> | 2011-01-29 18:36:18 +0100 |
|---|---|---|
| committer | Tobias Burnus <burnus@gcc.gnu.org> | 2011-01-29 18:36:18 +0100 |
| commit | 7320cf0901b5409c45d68b3c10cdd22eaf918fe5 (patch) | |
| tree | c8b7235eb4cb4f52b10b3bfed25bfdc84d8ed608 /gcc/fortran/iresolve.c | |
| parent | bd228fecfcb2471f40415f714ccb50278c9f7692 (diff) | |
| download | gcc-7320cf0901b5409c45d68b3c10cdd22eaf918fe5.zip gcc-7320cf0901b5409c45d68b3c10cdd22eaf918fe5.tar.gz gcc-7320cf0901b5409c45d68b3c10cdd22eaf918fe5.tar.bz2 | |
re PR fortran/47531 (SHAPE misses KIND= support)
2011-01-29 Tobias Burnus <burnus@net-b.de>
PR fortran/47531
* check.c (gfc_check_shape): Support kind argument in SHAPE.
* intrinsic.c (add_functions): Ditto.
* resolve.c (gfc_resolve_shape): Ditto.
* simplify.c (gfc_simplify_shape): Ditto.
* intrinsic.h (gfc_check_shape, gfc_resolve_shape,
gfc_simplify_shape): Update prototypes.
* intrinisc.text (SHAPE): Document kind argument.
2011-01-29 Tobias Burnus <burnus@net-b.de>
PR fortran/47531
* gfortran.dg/shape_6.f90: New.
From-SVN: r169392
Diffstat (limited to 'gcc/fortran/iresolve.c')
| -rw-r--r-- | gcc/fortran/iresolve.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/gcc/fortran/iresolve.c b/gcc/fortran/iresolve.c index 12854fb..ec9dd42 100644 --- a/gcc/fortran/iresolve.c +++ b/gcc/fortran/iresolve.c @@ -2185,10 +2185,15 @@ gfc_resolve_set_exponent (gfc_expr *f, gfc_expr *x, void -gfc_resolve_shape (gfc_expr *f, gfc_expr *array) +gfc_resolve_shape (gfc_expr *f, gfc_expr *array, gfc_expr *kind) { f->ts.type = BT_INTEGER; - f->ts.kind = gfc_default_integer_kind; + + if (kind) + f->ts.kind = mpz_get_si (kind->value.integer); + else + f->ts.kind = gfc_default_integer_kind; + f->rank = 1; f->shape = gfc_get_shape (1); mpz_init_set_ui (f->shape[0], array->rank); |