procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

re PR fortran/36476 (ICE: len=* CHARACTER array with separate PARAMETER statement)

Browse source 
2008-06-13  Tobias Burnus  <burnus@net-b.de>

        PR fortran/36476
        * decl.c (do_parm): Handle init expression for len=*.

2008-06-13  Tobias Burnus  <burnus@net-b.de>

        PR fortran/36476
        * gfortran.dg/parameter_array_init_4.f90: New.

From-SVN: r136754
This commit is contained in:
Tobias Burnus 2008-06-13 15:04:26 +02:00 • committed by Tobias Burnus
parent 4dc3e453c8
commit 357ad64f1c
4 changed files with 84 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
gcc/fortran/ChangeLog
View file

@ -1,3 +1,8 @@
2008-06-13 Tobias Burnus <burnus@net-b.de>
PR fortran/36476
* decl.c (do_parm): Handle init expression for len=*.
2008-06-12 Tobias Burnus <burnus@net-b.de>
PR fortran/36462

21
gcc/fortran/decl.c
View file

@ -5820,10 +5820,27 @@ do_parm (void)
&& sym->ts.cl->length != NULL
&& sym->ts.cl->length->expr_type == EXPR_CONSTANT
&& init->expr_type == EXPR_CONSTANT
&& init->ts.type == BT_CHARACTER
&& init->ts.kind == 1)
&& init->ts.type == BT_CHARACTER)
gfc_set_constant_character_len (
mpz_get_si (sym->ts.cl->length->value.integer), init, false);
else if (sym->ts.type == BT_CHARACTER && sym->ts.cl != NULL
&& sym->ts.cl->length == NULL)
{
int clen;
if (init->expr_type == EXPR_CONSTANT)
{
clen = init->value.character.length;
sym->ts.cl->length = gfc_int_expr (clen);
}
else if (init->expr_type == EXPR_ARRAY)
{
gfc_expr *p = init->value.constructor->expr;
clen = p->value.character.length;
sym->ts.cl->length = gfc_int_expr (clen);
}
else if (init->ts.cl && init->ts.cl->length)
sym->ts.cl->length = gfc_copy_expr (sym->value->ts.cl->length);
}
sym->value = init;
return MATCH_YES;

5
gcc/testsuite/ChangeLog
View file

@ -1,3 +1,8 @@
2008-06-13 Tobias Burnus <burnus@net-b.de>
PR fortran/36476
* gfortran.dg/parameter_array_init_4.f90: New.
2008-06-13 Eric Botcazou <ebotcazou@adacore.com>
* gcc.c-torture/compile/20080613-1.c: New test.

55
gcc/testsuite/gfortran.dg/parameter_array_init_4.f90 Normal file
View file

@ -0,0 +1,55 @@
! { dg-do run }
! PR fortran/36476
!
IMPLICIT NONE
CHARACTER (len=*) MY_STRING(1:3), my_string_s
PARAMETER ( MY_STRING = (/ "A" , "B", "C" /) )
PARAMETER ( MY_STRING_S = "AB C" )
character(len=*), parameter :: str(2) = [ 'Ac','cc']
character(len=*), parameter :: str_s = 'Acc'
CHARACTER (kind=1,len=*) MY_STRING1(1:3), my_string_s1
PARAMETER ( MY_STRING1 = (/ "A" , "B", "C" /) )
PARAMETER ( MY_STRING_S1 = "AB C" )
character(kind=1,len=*), parameter :: str1(2) = [ 1_'Ac',1_'cc']
character(kind=1,len=*), parameter :: str_s1 = 'Acc'
CHARACTER (kind=4,len=*) MY_STRING4(1:3), my_string_s4
PARAMETER ( MY_STRING4 = (/ "A" , "B", "C" /) )
PARAMETER ( MY_STRING_S4 = "AB C" )
character(kind=4,len=*), parameter :: str4(2) = [ 1_'Ac',1_'cc']
character(kind=4,len=*), parameter :: str_s4 = 'Acc'
if(len(MY_STRING) /= 1) call abort()
if( MY_STRING(1) /= "A" &
.or.MY_STRING(2) /= "B" &
.or.MY_STRING(3) /= "C") call abort()
if(len(MY_STRING_s) /= 4) call abort()
if(MY_STRING_S /= "AB C") call abort()
if(len(str) /= 2) call abort()
if(str(1) /= "Ac" .or. str(2) /= "cc") call abort()
if(len(str_s) /= 3) call abort()
if(str_s /= 'Acc') call abort()
if(len(MY_STRING1) /= 1) call abort()
if( MY_STRING1(1) /= 1_"A" &
.or.MY_STRING1(2) /= 1_"B" &
.or.MY_STRING1(3) /= 1_"C") call abort()
if(len(MY_STRING_s1) /= 4) call abort()
if(MY_STRING_S1 /= 1_"AB C") call abort()
if(len(str1) /= 2) call abort()
if(str1(1) /= 1_"Ac" .or. str1(2) /= 1_"cc") call abort()
if(len(str_s1) /= 3) call abort()
if(str_s1 /= 1_'Acc') call abort()
if(len(MY_STRING4) /= 1) call abort()
if( MY_STRING4(1) /= 4_"A" &
.or.MY_STRING4(2) /= 4_"B" &
.or.MY_STRING4(3) /= 4_"C") call abort()
if(len(MY_STRING_s4) /= 4) call abort()
if(MY_STRING_S4 /= 4_"AB C") call abort()
if(len(str4) /= 2) call abort()
if(str4(1) /= 4_"Ac" .or. str4(2) /= 4_"cc") call abort()
if(len(str_s4) /= 3) call abort()
if(str_s4 /= 4_'Acc') call abort()
end