From 7e2eba4bf9d7f8610d01777731dd4aa795f324b8 Mon Sep 17 00:00:00 2001 From: David Edelsohn Date: Sun, 17 Jul 2005 00:48:46 +0000 Subject: [PATCH] re PR fortran/21730 ([4.0 only] Character length incorrect.) PR fortran/21730 * decl.c (do_parm): Adjust character initializer to character length of symbol before assigning. From-SVN: r102104 --- gcc/fortran/ChangeLog | 6 ++++++ gcc/fortran/decl.c | 10 ++++++++++ 2 files changed, 16 insertions(+) diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 017282ec71a..49b8dae11cc 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,9 @@ +2005-07-16 David Edelsohn + + PR fortran/21730 + * decl.c (do_parm): Adjust character initializer to character length + of symbol before assigning. + 2005-07-14 Steve Ellcey * trans-types.c (MAX_REAL_KINDS): Increase from 4 to 5. diff --git a/gcc/fortran/decl.c b/gcc/fortran/decl.c index 9852cb0c42b..9288ab9d4ef 100644 --- a/gcc/fortran/decl.c +++ b/gcc/fortran/decl.c @@ -3101,6 +3101,16 @@ do_parm (void) goto cleanup; } + if (sym->ts.type == BT_CHARACTER + && sym->ts.cl != NULL + && 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) + gfc_set_constant_character_len ( + mpz_get_si (sym->ts.cl->length->value.integer), init); + sym->value = init; return MATCH_YES;