re PR fortran/29210 ([4.1 only] Name parameter in complex constant not allowed in...

	PR fortran/29210

	* primary.c (match_sym_complex_part): Named constants as real or
	imaginary part of complex a named constant are only allowed in
	Fortran 2003.

	* gfortran.dg/complex_parameter_1.f90: New test.

From-SVN: r117368

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index ff1f55ed2ef7be07af7b5f40f3d10b18643b6a38..e574f1869444d18cc7ebbddae44472eecb05fc5d 100644 (file)
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,10 @@
+2006-10-02  Francois-Xavier Coudert  <coudert@clipper.ens.fr>
+
+       PR fortran/29210
+       * primary.c (match_sym_complex_part): Named constants as real or
+       imaginary part of complex a named constant are only allowed in
+       Fortran 2003.
+
 2006-10-01  Brooks Moses  <bmoses@stanford.edu>
 
        * gfortran.texi: Corrected references to MALLOC intrinsic.

diff --git a/gcc/fortran/primary.c b/gcc/fortran/primary.c
index 6f61ad749ea4396c2d790303426bb7f29a001d95..7adc9082515af115f20634ffe7efc069d2f7b4c0 100644 (file)
--- a/gcc/fortran/primary.c
+++ b/gcc/fortran/primary.c
@@ -1084,6 +1084,10 @@ match_sym_complex_part (gfc_expr ** result)
       return MATCH_ERROR;
     }
 
+  if (gfc_notify_std (GFC_STD_F2003, "Fortran 2003: PARAMETER symbol in "
+                     "complex constant at %C") == FAILURE)
+    return MATCH_ERROR;
+
   switch (sym->value->ts.type)
     {
     case BT_REAL:

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index c3efeac11f40186e45a8e08e974a2693166a167e..b4c70d2df5c1c13d7f5326f9779d8c2ac4d837b2 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2006-10-02  Francois-Xavier Coudert  <coudert@clipper.ens.fr>
+
+       PR fortran/29210
+       * gfortran.dg/complex_parameter_1.f90: New test.
+
 2006-10-02  Jakub Jelinek  <jakub@redhat.com>
 
        PR c/29154

diff --git a/gcc/testsuite/gfortran.dg/complex_parameter_1.f90 b/gcc/testsuite/gfortran.dg/complex_parameter_1.f90
new file mode 100644 (file)
index 0000000..7b631a6
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/complex_parameter_1.f90
@@ -0,0 +1,10 @@
+! { dg-do compile }
+! { dg-options "-std=f95" }
+  integer,parameter :: i = 42
+  real,parameter :: x = 17.
+  complex,parameter :: z = (1.,2.)
+  complex,parameter :: c1 = (i, 0.5) ! { dg-error "Fortran 2003: PARAMETER symbol in complex constant" }
+  complex,parameter :: c2 = (x, 0.5) ! { dg-error "Fortran 2003: PARAMETER symbol in complex constant" }
+  complex,parameter :: c3 = (z, 0.) ! { dg-error "Fortran 2003: PARAMETER symbol in complex constant" }
+  print *, c1, c2, c3
+  end