OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

re PR fortran/51055 (deferred length character allocation: allocate(character(len=i)::s) rejected) 

2012-05-23  Tobias Burnus  <burnus@net-b.de>

        PR fortran/51055
        PR fortran/45170
        * match.c (gfc_match_allocate): Set length_from_typespec
        for characters.
        * resolve.c (resolve_charlen): If set, don't check whether
        the len is a specification expression.

2012-05-23  Tobias Burnus  <burnus@net-b.de>

        PR fortran/51055
        PR fortran/45170
        * gfortran.dg/allocate_with_typespec_6.f90: New.

From-SVN: r187811
This commit is contained in:
Tobias Burnus 2012-05-23 22:35:30 +02:00 committed by Tobias Burnus
parent 2e74510357
commit 239b48db1b
5 changed files with 51 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gcc/fortran/ChangeLog
View File

@ -1,3 +1,12 @@
2012-05-23 Tobias Burnus <burnus@net-b.de>
PR fortran/51055
PR fortran/45170
* match.c (gfc_match_allocate): Set length_from_typespec
for characters.
* resolve.c (resolve_charlen): If set, don't check whether
the len is a specification expression.
2012-05-22 Tobias Burnus <burnus@net-b.de>
PR fortran/53389

3
gcc/fortran/match.c
View File

@ -3466,6 +3466,9 @@ gfc_match_allocate (void)
"type parameter", &old_locus);
goto cleanup;
}
if (ts.type == BT_CHARACTER)
ts.u.cl->length_from_typespec = true;
}
else
{

20
gcc/fortran/resolve.c
View File

@ -9945,12 +9945,24 @@ resolve_charlen (gfc_charlen *cl)
cl->resolved = 1;
specification_expr = 1;
if (resolve_index_expr (cl->length) == FAILURE)
if (cl->length_from_typespec)
{
specification_expr = 0;
return FAILURE;
if (gfc_resolve_expr (cl->length) == FAILURE)
return FAILURE;
if (gfc_simplify_expr (cl->length, 0) == FAILURE)
return FAILURE;
}
else
{
specification_expr = 1;
if (resolve_index_expr (cl->length) == FAILURE)
{
specification_expr = 0;
return FAILURE;
}
}
/* "If the character length parameter value evaluates to a negative

6
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,9 @@
2012-05-23 Tobias Burnus <burnus@net-b.de>
PR fortran/51055
PR fortran/45170
* gfortran.dg/allocate_with_typespec_6.f90: New.
2012-05-23 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/29185

17
gcc/testsuite/gfortran.dg/allocate_with_typespec_6.f90 Normal file
View File

@ -0,0 +1,17 @@
! { dg-do compile }
!
! PR fortran/51055
! PR fortran/45170 comment 14
!
! Contributed by Juha Ruokolainen
! and Hans-Werner Boschmann
!
! gfortran was before checking whether the length
! was a specification expression.
!
program a
character(len=:), allocatable :: s
integer :: i=10
allocate(character(len=i)::s)
end program a