From: Daniel Franke <franke.daniel@gmail.com>
Date: Tue, 22 Jan 2008 12:19:54 +0000 (-0500)
Subject: re PR fortran/34915 (-std=f95 rejects len_trim() and index() in init expressions)
X-Git-Tag: releases/gcc-4.3.0~488
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c29164019f085d149e86412dfbbe0adeb79eeaba;p=thirdparty%2Fgcc.git

re PR fortran/34915 (-std=f95 rejects len_trim() and index() in init expressions)

gcc/fortran:
2008-01-22  Daniel Franke  <franke.daniel@gmail.com>

	PR fortran/34915
	* expr.c (check_elemental): Fix check for valid data types.


gcc/testsuite:
	2008-01-22  Daniel Franke  <franke.daniel@gmail.com>

	PR fortran/34915
	* gfortran.dg/initialization_18.f90: New test.

From-SVN: r131715
---

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 57c9142ba940..72af9f03ca66 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,8 @@
+2008-01-22  Daniel Franke  <franke.daniel@gmail.com>
+
+	PR fortran/34915
+	* expr.c (check_elemental): Fix check for valid data types.
+
 2008-01-22  Tobias Burnus  <burnus@net-b.de>
 
 	PR fortran/34899
diff --git a/gcc/fortran/expr.c b/gcc/fortran/expr.c
index e8b65483e76c..fb1886e94b61 100644
--- a/gcc/fortran/expr.c
+++ b/gcc/fortran/expr.c
@@ -2109,7 +2109,8 @@ check_elemental (gfc_expr *e)
       || !e->value.function.isym->elemental)
     return MATCH_NO;
 
-  if ((e->ts.type != BT_INTEGER || e->ts.type != BT_CHARACTER)
+  if (e->ts.type != BT_INTEGER
+      && e->ts.type != BT_CHARACTER
       && gfc_notify_std (GFC_STD_F2003, "Extension: Evaluation of "
 			"nonstandard initialization expression at %L",
 			&e->where) == FAILURE)
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 7e4fd057f0aa..e8cc0c25ce41 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2008-01-22  Daniel Franke  <franke.daniel@gmail.com>
+
+	PR fortran/34915
+	* gfortran.dg/initialization_18.f90: New test.
+
 2008-01-22  Tobias Burnus  <burnus@net-b.de>
 
 	PR fortran/34899
diff --git a/gcc/testsuite/gfortran.dg/initialization_18.f90 b/gcc/testsuite/gfortran.dg/initialization_18.f90
new file mode 100644
index 000000000000..4e26e1b9ec0a
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/initialization_18.f90
@@ -0,0 +1,10 @@
+! { dg-do compile }
+! { dg-options "-std=f95 -Wall" }
+!
+! PR fortran/34915
+! Testcase contributed by Al Greynolds via comp.lang.fortran.
+!
+
+ character(*),dimension(3),parameter :: a=(/'a()  ','b(,) ','c(,,)'/)
+ integer,dimension(3),parameter :: l=len_trim(a)
+end