diff options
| author | Tobias Burnus <burnus@net-b.de> | 2012-05-12 11:53:53 +0200 |
|---|---|---|
| committer | Tobias Burnus <burnus@gcc.gnu.org> | 2012-05-12 11:53:53 +0200 |
| commit | dd9123310d0f4e6d7815d5c44f9c8c0e59521a6f (patch) | |
| tree | 933fc64572ba82a7f17d058ef604c136a4519126 | |
| parent | 3906795848d851fde84d9cc12067f153561bb11a (diff) | |
| download | gcc-dd9123310d0f4e6d7815d5c44f9c8c0e59521a6f.zip gcc-dd9123310d0f4e6d7815d5c44f9c8c0e59521a6f.tar.gz gcc-dd9123310d0f4e6d7815d5c44f9c8c0e59521a6f.tar.bz2 | |
re PR fortran/49110 (Deferred-length character result triggers (false positive) error for pure procedures)
2012-05-12 Tobias Burnus <burnus@net-b.de>
PR fortran/49110
PR fortran/52843
* resolve.c (resolve_fl_procedure): Don't regard
character(len=:) as character(*) in the diagnostic.
2012-05-12 Tobias Burnus <burnus@net-b.de>
PR fortran/49110
PR fortran/52843
* gfortran.dg/deferred_type_param_5.f90: New.
From-SVN: r187427
| -rw-r--r-- | gcc/fortran/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/fortran/resolve.c | 2 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/deferred_type_param_5.f90 | 51 |
4 files changed, 65 insertions, 1 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index e761ef5..faffa29 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,10 @@ +2012-05-12 Tobias Burnus <burnus@net-b.de> + + PR fortran/49110 + PR fortran/52843 + * resolve.c (resolve_fl_procedure): Don't regard + character(len=:) as character(*) in the diagnostic. + 2012-05-11 Thomas Koenig <tkoenig@gcc.gnu.org> PR fortran/52537 diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c index b3a23ed..4a07230 100644 --- a/gcc/fortran/resolve.c +++ b/gcc/fortran/resolve.c @@ -10726,7 +10726,7 @@ resolve_fl_procedure (gfc_symbol *sym, int mp_flag) actual length; (ii) To declare a named constant; or (iii) External function - but length must be declared in calling scoping unit. */ if (sym->attr.function - && sym->ts.type == BT_CHARACTER + && sym->ts.type == BT_CHARACTER && !sym->ts.deferred && sym->ts.u.cl && sym->ts.u.cl->length == NULL) { if ((sym->as && sym->as->rank) || (sym->attr.pointer) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 282cfc0..5f5e689 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2012-05-12 Tobias Burnus <burnus@net-b.de> + + PR fortran/49110 + PR fortran/52843 + * gfortran.dg/deferred_type_param_5.f90: New. + 2012-05-12 Paolo Carlini <paolo.carlini@oracle.com> * g++.dg/parse/error47.C: New. diff --git a/gcc/testsuite/gfortran.dg/deferred_type_param_5.f90 b/gcc/testsuite/gfortran.dg/deferred_type_param_5.f90 new file mode 100644 index 0000000..8380b9d --- /dev/null +++ b/gcc/testsuite/gfortran.dg/deferred_type_param_5.f90 @@ -0,0 +1,51 @@ +! { dg-do compile } +! +! PR fortran/49110 +! PR fortran/52843 +! +! Based on a contributed code by jwmwalrus@gmail.com +! +! Before, character(len=:) result variable were rejected in PURE functions. +! +module mod1 + use iso_c_binding + implicit none + +contains + pure function c_strlen(str) + character(KIND = C_CHAR), intent(IN) :: str(*) + integer :: c_strlen,i + + i = 1 + do + if (i < 1) then + c_strlen = 0 + return + end if + if (str(i) == c_null_char) exit + i = i + 1 + end do + c_strlen = i - 1 + end function c_strlen + pure function c2fstring(cbuffer) result(string) + character(:), allocatable :: string + character(KIND = C_CHAR), intent(IN) :: cbuffer(*) + integer :: i + + continue + string = REPEAT(' ', c_strlen(cbuffer)) + + do i = 1, c_strlen(cbuffer) + if (cbuffer(i) == C_NULL_CHAR) exit + string(i:i) = cbuffer(i) + enddo + + string = TRIM(string) + end function +end module mod1 + +use mod1 +character(len=:), allocatable :: str +str = c2fstring("ABCDEF"//c_null_char//"GHI") +if (len(str) /= 6 .or. str /= "ABCDEF") call abort() +end |