diff options
| author | burnus <burnus@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-01-29 17:36:18 +0000 |
|---|---|---|
| committer | burnus <burnus@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-01-29 17:36:18 +0000 |
| commit | ac6914b068c2966dfd41b22479cb848b5df5dbbd (patch) | |
| tree | c8b7235eb4cb4f52b10b3bfed25bfdc84d8ed608 /gcc/fortran/iresolve.c | |
| parent | 17314895e055864ff925d09bd08079fb8f56de3f (diff) | |
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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@169392 138bc75d-0d04-0410-961f-82ee72b054a4
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 12854fbf638b..ec9dd422fb62 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); |