diff options
| author | Janus Weil <janus@gcc.gnu.org> | 2009-08-31 12:22:32 +0200 |
|---|---|---|
| committer | Janus Weil <janus@gcc.gnu.org> | 2009-08-31 12:22:32 +0200 |
| commit | 2fbd4117c6872453531aa88123f0ea8efdf1b4df (patch) | |
| tree | 10c30d1e9b304179c69b618cd75553a751574792 /gcc/fortran/resolve.c | |
| parent | 4a435ffc1c4509ea53e9f93359ef0ed73dd12eec (diff) | |
| download | gcc-2fbd4117c6872453531aa88123f0ea8efdf1b4df.zip gcc-2fbd4117c6872453531aa88123f0ea8efdf1b4df.tar.gz gcc-2fbd4117c6872453531aa88123f0ea8efdf1b4df.tar.bz2 | |
re PR fortran/40996 ([F03] ALLOCATABLE scalars)
2009-08-31 Janus Weil <janus@gcc.gnu.org>
PR fortran/40996
* check.c (gfc_check_allocated): Implement allocatable scalars.
* resolve.c (resolve_allocate_expr,resolve_fl_var_and_proc): Ditto.
* trans-intrinsic.c (gfc_conv_allocated): Ditto.
2009-08-31 Janus Weil <janus@gcc.gnu.org>
PR fortran/40996
* gfortran.dg/allocatable_scalar_1.f90: New.
* gfortran.dg/allocatable_scalar_2.f90: Renamed from finalize_9.f03.
* gfortran.dg/finalize_9.f03: Renamed to allocatable_scalar_2.f90.
* gfortran.dg/proc_ptr_comp_pass_4.f90: Modified.
From-SVN: r151240
Diffstat (limited to 'gcc/fortran/resolve.c')
| -rw-r--r-- | gcc/fortran/resolve.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c index f10a412..b665c35 100644 --- a/gcc/fortran/resolve.c +++ b/gcc/fortran/resolve.c @@ -5643,7 +5643,7 @@ resolve_allocate_expr (gfc_expr *e, gfc_code *code) code->next = init_st; } - if (pointer && dimension == 0) + if (pointer || dimension == 0) return SUCCESS; /* Make sure the next-to-last reference node is an array specification. */ @@ -7955,11 +7955,14 @@ resolve_fl_var_and_proc (gfc_symbol *sym, int mp_flag) if (sym->attr.allocatable) { if (sym->attr.dimension) - gfc_error ("Allocatable array '%s' at %L must have " - "a deferred shape", sym->name, &sym->declared_at); - else - gfc_error ("Scalar object '%s' at %L may not be ALLOCATABLE", - sym->name, &sym->declared_at); + { + gfc_error ("Allocatable array '%s' at %L must have " + "a deferred shape", sym->name, &sym->declared_at); + return FAILURE; + } + else if (gfc_notify_std (GFC_STD_F2003, "Scalar object '%s' at %L " + "may not be ALLOCATABLE", sym->name, + &sym->declared_at) == FAILURE) return FAILURE; } |