aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobias Burnus <burnus@net-b.de>2007-12-25 13:05:23 +0100
committerTobias Burnus <burnus@gcc.gnu.org>2007-12-25 13:05:23 +0100
commit1283ab121d8d5ef620e27fcdf4349321dbb0352f (patch)
tree73f43fe114afe6c19e945f51a0f1c8317bb62669
parenta1ba31ced9af40c3ac37a968870e0363f7ae08ca (diff)
downloadgcc-1283ab121d8d5ef620e27fcdf4349321dbb0352f.zip
gcc-1283ab121d8d5ef620e27fcdf4349321dbb0352f.tar.gz
gcc-1283ab121d8d5ef620e27fcdf4349321dbb0352f.tar.bz2
re PR fortran/34514 (Accepts invalid: Dimensions specified for N after initialisation)
2007-12-25 Tobias Burnus <burnus@net-b.de> 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 <burnus@net-b.de> PR fortran/34514 * gfortran.dg/initialization_17.f90: New. From-SVN: r131169
-rw-r--r--gcc/fortran/ChangeLog7
-rw-r--r--gcc/fortran/decl.c15
-rw-r--r--gcc/testsuite/ChangeLog5
-rw-r--r--gcc/testsuite/gfortran.dg/initialization_17.f9010
4 files changed, 37 insertions, 0 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 7ffa51d..3e16f9b 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,10 @@
+2007-12-25 Tobias Burnus <burnus@net-b.de>
+
+ 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 <franke.daniel@gmail.com>
PR fortran/34533
diff --git a/gcc/fortran/decl.c b/gcc/fortran/decl.c
index 072477e..dd8eb35 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 4bfd523..069733d 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2007-12-25 Tobias Burnus <burnus@net-b.de>
+
+ PR fortran/34514
+ * gfortran.dg/initialization_17.f90: New.
+
2007-12-25 Thomas Koenig <tkoenig@gcc.gnu.org>
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 0000000..c7b73b5
--- /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