re PR fortran/32906 (Error: Parameter array ... cannot be automatic or assumed shape)

gcc/fortran:
2007-07-29  Daniel Franke  <franke.daniel@gmail.com>

	PR fortran/32906
	* resolve.c (resolve_fl_parameter): Check for constant shape arrays,
	adjusted error message.

gcc/testsuite:
2007-07-29  Daniel Franke  <franke.daniel@gmail.com>

	PR fortran/32906
	* gfortran.dg/shape_1.f90: Adjust error message.
	* gfortran.dg/parameter_array_ref_1.f90: New test.

From-SVN: r127043

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index b193a61710a4130a9d098f7ce93eaa94f4ab3053..671f99ead372d71c719fbe350d0050dfd2641dbf 100644 (file)
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,9 @@
+2007-07-29  Daniel Franke  <franke.daniel@gmail.com>
+
+       PR fortran/32906
+       * resolve.c (resolve_fl_parameter): Check for constant shape arrays,
+       adjusted error message.
+
 2007-07-29  Daniel Franke  <franke.daniel@gmail.com>
 
        * invoke.texi: Removed -w from option summary.

diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c
index afa1ed831193272e034b7f8784417685ab141364..e2ebc992d74ff7748d9dafbc29ba81df51860113 100644 (file)
--- a/gcc/fortran/resolve.c
+++ b/gcc/fortran/resolve.c
@@ -7137,10 +7137,12 @@ static try
 resolve_fl_parameter (gfc_symbol *sym)
 {
   /* A parameter array's shape needs to be constant.  */
-  if (sym->as != NULL && !gfc_is_compile_time_shape (sym->as))
+  if (sym->as != NULL 
+      && (sym->as->type == AS_DEFERRED
+          || is_non_constant_shape_array (sym)))
     {
       gfc_error ("Parameter array '%s' at %L cannot be automatic "
-                "or assumed shape", sym->name, &sym->declared_at);
+                "or of deferred shape", sym->name, &sym->declared_at);
       return FAILURE;
     }
 

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 9837d9c18a820319aa416bc4b7664baff3fb820c..388c72127ec2b69ccbfdbb3916ec43e8a5a283f8 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2007-07-29  Daniel Franke  <franke.daniel@gmail.com>
+
+       PR fortran/32906
+       * gfortran.dg/shape_1.f90: Adjust error message.
+       * gfortran.dg/parameter_array_ref_1.f90: New test.
+
 2007-07-29  Jerry DeLisle  <jvdelisle@gcc.gnu.org>
 
        PR fortran/31609

diff --git a/gcc/testsuite/gfortran.dg/parameter_array_ref_1.f90 b/gcc/testsuite/gfortran.dg/parameter_array_ref_1.f90
new file mode 100644 (file)
index 0000000..c22f343
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/parameter_array_ref_1.f90
@@ -0,0 +1,13 @@
+! { dg-do compile }
+!
+! PR fortran/32906 - Parameter array ... cannot be automatic or assumed shape
+!
+! Testcase contributed by Florian Ladstaedter <flad AT gmx DOT at>
+!
+program test_program
+  integer, parameter :: len = 1
+  integer, parameter :: arr(max(len,1)) = (/1/)
+
+  character(len=*), dimension (1), parameter             :: specStr = (/'string'/)
+  double precision, dimension (size(specStr)), parameter :: specNum = (/99.0d0/)
+end

diff --git a/gcc/testsuite/gfortran.dg/shape_1.f90 b/gcc/testsuite/gfortran.dg/shape_1.f90
index aaf943f6294e365d98cad8cf18350c737f4c1a65..9292adb2e71db2deaf945412a197b1d8687e14d0 100644 (file)
--- a/gcc/testsuite/gfortran.dg/shape_1.f90
+++ b/gcc/testsuite/gfortran.dg/shape_1.f90
@@ -1,6 +1,6 @@
 ! { dg-do compile }
 ! PR 13201 we used to not give an error in those cases
 subroutine foo(n) 
-  integer, parameter :: a(n) = 1 ! { dg-error "cannot be automatic" "automatic shape" }
-  integer, parameter :: z(:) = (/ 1,2,3 /) ! { dg-error "cannot be automatic" "assumed shape" }
+  integer, parameter :: a(n) = 1           ! { dg-error "cannot be automatic" "automatic shape" }
+  integer, parameter :: z(:) = (/ 1,2,3 /) ! { dg-error "cannot be automatic" "deferred shape" }
 end subroutine