From abeab93869b150cb26b4267d14e3362dadb0a8be Mon Sep 17 00:00:00 2001 From: Paul Thomas Date: Thu, 11 Jun 2009 20:11:59 +0000 Subject: re PR fortran/40402 (Problem with data statement involving structure constructors containing non-initialisation expressions) 2009-06-11 Paul Thomas PR fortran/40402 * resolve.c (next_data_value): It is an error if the value is not constant. 2009-06-11 Paul Thomas PR fortran/40402 * gfortran.dg/data_value_1.f90: New test. From-SVN: r148396 --- gcc/fortran/ChangeLog | 6 ++++++ gcc/fortran/resolve.c | 5 ++++- 2 files changed, 10 insertions(+), 1 deletion(-) (limited to 'gcc/fortran') diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 1a2f41b..2f0ff9d 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,9 @@ +2009-06-11 Paul Thomas + + PR fortran/40402 + * resolve.c (next_data_value): It is an error if the value is + not constant. + 2009-06-11 Francois-Xavier Coudert PR fortran/38718 diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c index 5bb38fe..04e03cc 100644 --- a/gcc/fortran/resolve.c +++ b/gcc/fortran/resolve.c @@ -9852,9 +9852,12 @@ values; static gfc_try next_data_value (void) { - while (mpz_cmp_ui (values.left, 0) == 0) { + if (!gfc_is_constant_expr (values.vnode->expr)) + gfc_error ("non-constant DATA value at %L", + &values.vnode->expr->where); + if (values.vnode->next == NULL) return FAILURE; -- cgit v1.1