diff options
| author | Jerry DeLisle <jvdelisle@gcc.gnu.org> | 2007-11-20 01:37:43 +0000 |
|---|---|---|
| committer | Jerry DeLisle <jvdelisle@gcc.gnu.org> | 2007-11-20 01:37:43 +0000 |
| commit | e76e6ce3ffd67d572aea440a61f41f67a0fc1c4d (patch) | |
| tree | 8a68fc2c9d48c052a942710d7908b14ec1dd65c4 /gcc/fortran/iresolve.c | |
| parent | 9fc1c58ff05f4209eb29e14997ab6f6d21dabf33 (diff) | |
| download | gcc-e76e6ce3ffd67d572aea440a61f41f67a0fc1c4d.tar.gz | |
re PR fortran/33317 (CSHIFT/EOSHIFT: Rejects optional dummy for DIM=)
2007-11-19 Jerry DeLisle <jvdelisle@gcc.gnu.org>
PR fortran/33317
* trans-expr.c (gfc_conv_missing_dummy): Revert.
* iresolve.c (gfc_resolve_cshift): Revert.
(gfc_resolve_eoshift): Likewise.
* check.c (gfc_check_cshift): Revert.
(gfc_check_eoshift): Likewise.
From-SVN: r130304
Diffstat (limited to 'gcc/fortran/iresolve.c')
| -rw-r--r-- | gcc/fortran/iresolve.c | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/gcc/fortran/iresolve.c b/gcc/fortran/iresolve.c index 9b6337a54e6..e685a0a263d 100644 --- a/gcc/fortran/iresolve.c +++ b/gcc/fortran/iresolve.c @@ -583,9 +583,13 @@ gfc_resolve_cshift (gfc_expr *f, gfc_expr *array, gfc_expr *shift, gfc_convert_type_warn (shift, &ts, 2, 0); } - /* Mark this for later setting the type in gfc_conv_missing_dummy. */ - if (dim != NULL && dim->symtree != NULL) - dim->symtree->n.sym->attr.untyped = 1; + if (dim != NULL) + { + gfc_resolve_dim_arg (dim); + /* Convert dim to shift's kind, so we don't need so many variations. */ + if (dim->ts.kind != shift->ts.kind) + gfc_convert_type_warn (dim, &shift->ts, 2, 0); + } f->value.function.name = gfc_get_string (PREFIX ("cshift%d_%d%s"), n, shift->ts.kind, @@ -704,9 +708,13 @@ gfc_resolve_eoshift (gfc_expr *f, gfc_expr *array, gfc_expr *shift, gfc_convert_type_warn (shift, &ts, 2, 0); } - /* Mark this for later setting the type in gfc_conv_missing_dummy. */ - if (dim != NULL && dim->symtree != NULL) - dim->symtree->n.sym->attr.untyped = 1; + if (dim != NULL) + { + gfc_resolve_dim_arg (dim); + /* Convert dim to shift's kind, so we don't need so many variations. */ + if (dim->ts.kind != shift->ts.kind) + gfc_convert_type_warn (dim, &shift->ts, 2, 0); + } f->value.function.name = gfc_get_string (PREFIX ("eoshift%d_%d%s"), n, shift->ts.kind, |