From 1283ab121d8d5ef620e27fcdf4349321dbb0352f Mon Sep 17 00:00:00 2001 From: Tobias Burnus Date: Tue, 25 Dec 2007 13:05:23 +0100 Subject: [PATCH] re PR fortran/34514 (Accepts invalid: Dimensions specified for N after initialisation) 2007-12-25 Tobias Burnus PR fortran/34514 * decl.c (attr_decl1): Reject specifying the DIMENSION for already initialized variable. (do_parm): Reject PARAMETER for already initialized variable. 2007-12-25 Tobias Burnus PR fortran/34514 * gfortran.dg/initialization_17.f90: New. From-SVN: r131169 --- gcc/fortran/ChangeLog | 7 +++++++ gcc/fortran/decl.c | 15 +++++++++++++++ gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/gfortran.dg/initialization_17.f90 | 10 ++++++++++ 4 files changed, 37 insertions(+) create mode 100644 gcc/testsuite/gfortran.dg/initialization_17.f90 diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 7ffa51d1516..3e16f9bd5a8 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,10 @@ +2007-12-25 Tobias Burnus + + PR fortran/34514 + * decl.c (attr_decl1): Reject specifying the DIMENSION for + already initialized variable. + (do_parm): Reject PARAMETER for already initialized variable. + 2007-12-25 Daniel Franke PR fortran/34533 diff --git a/gcc/fortran/decl.c b/gcc/fortran/decl.c index 072477ef3ac..dd8eb35ae6b 100644 --- a/gcc/fortran/decl.c +++ b/gcc/fortran/decl.c @@ -5151,6 +5151,14 @@ attr_decl1 (void) goto cleanup; } + if (current_attr.dimension && sym->value) + { + gfc_error ("Dimensions specified for %s at %L after its " + "initialisation", sym->name, &var_locus); + m = MATCH_ERROR; + goto cleanup; + } + if ((current_attr.allocatable || current_attr.pointer) && (m == MATCH_YES) && (as->type != AS_DEFERRED)) { @@ -5753,6 +5761,13 @@ do_parm (void) goto cleanup; } + if (sym->value) + { + gfc_error ("Initializing already initialized variable at %C"); + m = MATCH_ERROR; + goto cleanup; + } + if (sym->ts.type == BT_CHARACTER && sym->ts.cl != NULL && sym->ts.cl->length != NULL diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 4bfd5232c20..069733d0712 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2007-12-25 Tobias Burnus + + PR fortran/34514 + * gfortran.dg/initialization_17.f90: New. + 2007-12-25 Thomas Koenig PR libfortran/34566 diff --git a/gcc/testsuite/gfortran.dg/initialization_17.f90 b/gcc/testsuite/gfortran.dg/initialization_17.f90 new file mode 100644 index 00000000000..c7b73b583df --- /dev/null +++ b/gcc/testsuite/gfortran.dg/initialization_17.f90 @@ -0,0 +1,10 @@ +! { dg-do compile } +! +! PR fortran/34514 +! +! Initialization and typespec changes. +! +integer :: n = 5, m = 7 +parameter (n = 42) ! { dg-error "Initializing already initialized variable" } +dimension :: m(3) ! { dg-error "after its initialisation" } +end -- 2.30.2