diff options
| author | Jerry DeLisle <jvdelisle@gcc.gnu.org> | 2007-11-18 20:53:16 +0000 |
|---|---|---|
| committer | Jerry DeLisle <jvdelisle@gcc.gnu.org> | 2007-11-18 20:53:16 +0000 |
| commit | 33717d596b7b976fbdc0ed47788200aee0085a75 (patch) | |
| tree | 303cdfc1589a960500cc95db50a0570b408ad8fd /gcc/fortran/iresolve.c | |
| parent | 05969da4c37b0c4120a5ac7b7a803f3f98f972af (diff) | |
| download | gcc-33717d596b7b976fbdc0ed47788200aee0085a75.zip gcc-33717d596b7b976fbdc0ed47788200aee0085a75.tar.gz gcc-33717d596b7b976fbdc0ed47788200aee0085a75.tar.bz2 | |
trans-expr.c (gfc_conv_missing_dummy): Set the type of the dummy argument to default integer if flagged to do so.
2007-11-18 Jerry DeLisle <jvdelisle@gcc.gnu.org>
* trans-expr.c (gfc_conv_missing_dummy): Set the type of the dummy
argument to default integer if flagged to do so. Fix typo in comment.
* resolve.c (gfc_resolve_dim_arg): Whitespace cleanup.
* iresolve.c (gfc_resolve_cshift): Do not convert type, mark attribute
for converting the DIM type appropriately in trans-expr.c.
(gfc_resolve_eoshift): Likewise.
* check.c (dim_check): Remove pre-existing dead code.
(gfc_check_cshift): Enable dim_check to allow DIM as an optional.
(gfc_check_eoshift): Likewise.
* trans_intrinsic.c (gfc_conv_intrinsic_function_args): Fix whitespace.
From-SVN: r130276
Diffstat (limited to 'gcc/fortran/iresolve.c')
| -rw-r--r-- | gcc/fortran/iresolve.c | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/gcc/fortran/iresolve.c b/gcc/fortran/iresolve.c index 4a54963..9b6337a 100644 --- a/gcc/fortran/iresolve.c +++ b/gcc/fortran/iresolve.c @@ -583,13 +583,10 @@ gfc_resolve_cshift (gfc_expr *f, gfc_expr *array, gfc_expr *shift, gfc_convert_type_warn (shift, &ts, 2, 0); } - 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); - } + /* 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; + f->value.function.name = gfc_get_string (PREFIX ("cshift%d_%d%s"), n, shift->ts.kind, array->ts.type == BT_CHARACTER ? "_char" : ""); @@ -707,13 +704,9 @@ gfc_resolve_eoshift (gfc_expr *f, gfc_expr *array, gfc_expr *shift, gfc_convert_type_warn (shift, &ts, 2, 0); } - 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); - } + /* 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; f->value.function.name = gfc_get_string (PREFIX ("eoshift%d_%d%s"), n, shift->ts.kind, |