diff options
| author | Erik Edelmann <eedelman@gcc.gnu.org> | 2006-03-10 23:28:38 +0000 |
|---|---|---|
| committer | Erik Edelmann <eedelman@gcc.gnu.org> | 2006-03-10 23:28:38 +0000 |
| commit | 8e119f1b63d9de421ffdda86e8a710ba30b58d34 (patch) | |
| tree | df22f386bb6af80823879f5088a1bd3c99fb5e8f /gcc/fortran/symbol.c | |
| parent | ea725d4524db8fa1bc593f5aa0e297a01ab721f3 (diff) | |
| download | gcc-8e119f1b63d9de421ffdda86e8a710ba30b58d34.zip gcc-8e119f1b63d9de421ffdda86e8a710ba30b58d34.tar.gz gcc-8e119f1b63d9de421ffdda86e8a710ba30b58d34.tar.bz2 | |
symbol.c (check_conflict): Allow allocatable function results, except for elemental functions.
fortran/
2006-03-11 Erik Edelmann <eedelman@gcc.gnu.org>
* symbol.c (check_conflict): Allow allocatable function results,
except for elemental functions.
* trans-array.c (gfc_trans_allocate_temp_array): Rename to ...
(gfc_trans_create_temp_array): ... this, and add new argument callee_alloc.
(gfc_trans_array_constructor, gfc_conv_loop_setup): Update call
to gfc_trans_allocate_temp_array.
* trans-array.h (gfc_trans_allocate_temp_array): Update prototype.
* trans-expr.c (gfc_conv_function_call): Use new arg of
gfc_trans_create_temp_array avoid pre-allocation of temporary
result variables of pointer AND allocatable functions.
(gfc_trans_arrayfunc_assign): Return NULL for allocatable functions.
* resolve.c (resolve_symbol): Copy value of 'allocatable' attribute
from sym->result to sym.
testsuite/
2006-03-08 Paul Thomas <pault@gcc.gnu.org>
Erik Edelmann <eedelman@gcc.gnu.org>
* gfortran.dg/allocatable_function_1.f90: New.
* gfortran.dg/allocatable_function_2.f90: New.
From-SVN: r111951
Diffstat (limited to 'gcc/fortran/symbol.c')
| -rw-r--r-- | gcc/fortran/symbol.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/gcc/fortran/symbol.c b/gcc/fortran/symbol.c index e98556d..bd7ad1c 100644 --- a/gcc/fortran/symbol.c +++ b/gcc/fortran/symbol.c @@ -322,6 +322,7 @@ check_conflict (symbol_attribute * attr, const char * name, locus * where) conf (pointer, external); conf (pointer, intrinsic); conf (pointer, elemental); + conf (allocatable, elemental); conf (target, external); conf (target, intrinsic); @@ -337,8 +338,8 @@ check_conflict (symbol_attribute * attr, const char * name, locus * where) conf (allocatable, pointer); conf_std (allocatable, dummy, GFC_STD_F2003); - conf (allocatable, function); /* TODO: Allowed in Fortran 200x. */ - conf (allocatable, result); /* TODO: Allowed in Fortran 200x. */ + conf_std (allocatable, function, GFC_STD_F2003); + conf_std (allocatable, result, GFC_STD_F2003); conf (elemental, recursive); conf (in_common, dummy); |