aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Edelsohn <edelsohn@gnu.org>2005-07-17 00:48:46 +0000
committerDavid Edelsohn <dje@gcc.gnu.org>2005-07-16 20:48:46 -0400
commit7e2eba4bf9d7f8610d01777731dd4aa795f324b8 (patch)
treebd888ce71a949dedcbbf720f30df0156f2b235d5
parent30702a9f844e0181a720661a7d8ff066aef6a302 (diff)
downloadgcc-7e2eba4bf9d7f8610d01777731dd4aa795f324b8.zip
gcc-7e2eba4bf9d7f8610d01777731dd4aa795f324b8.tar.gz
gcc-7e2eba4bf9d7f8610d01777731dd4aa795f324b8.tar.bz2
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
-rw-r--r--gcc/fortran/ChangeLog6
-rw-r--r--gcc/fortran/decl.c10
2 files changed, 16 insertions, 0 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 017282e..49b8dae 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,9 @@
+2005-07-16 David Edelsohn <edelsohn@gnu.org>
+
+ PR fortran/21730
+ * decl.c (do_parm): Adjust character initializer to character length
+ of symbol before assigning.
+
2005-07-14 Steve Ellcey <sje@cup.hp.com>
* trans-types.c (MAX_REAL_KINDS): Increase from 4 to 5.
diff --git a/gcc/fortran/decl.c b/gcc/fortran/decl.c
index 9852cb0..9288ab9 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;