From: Tobias Burnus <burnus@net-b.de>
Date: Fri, 4 Jan 2008 09:11:26 +0000 (+0100)
Subject: re PR fortran/34557 (Rejects valid: EQUIVALENCE of character substrings)
X-Git-Tag: releases/gcc-4.3.0~758
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3c7215130f7f1c4677597a3882430fc65e2dba0c;p=thirdparty%2Fgcc.git

re PR fortran/34557 (Rejects valid: EQUIVALENCE of character substrings)

2008-01-04  Tobias Burnus  <burnus@net-b.de>

       PR fortran/34557
       * primary.c (match_varspec): Gobble whitespace before
       checking for '('.

2008-01-04  Tobias Burnus  <burnus@net-b.de>

       PR fortran/34557
       * gfortran.dg/equiv_substr.f90: New.

From-SVN: r131317
---

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index e69de29bb2d1..82f4cd7aea43 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -0,0 +1,5 @@
+2008-01-04  Tobias Burnus  <burnus@net-b.de>
+
+	PR fortran/34557
+	* primary.c (match_varspec): Gobble whitespace before
+	checking for '('.
diff --git a/gcc/fortran/primary.c b/gcc/fortran/primary.c
index 155cfb16dfc1..1d282f2b37c3 100644
--- a/gcc/fortran/primary.c
+++ b/gcc/fortran/primary.c
@@ -1679,6 +1679,7 @@ match_varspec (gfc_expr *primary, int equiv_flag)
 
   tail = NULL;
 
+  gfc_gobble_whitespace ();
   if ((equiv_flag && gfc_peek_char () == '(') || sym->attr.dimension)
     {
       /* In EQUIVALENCE, we don't know yet whether we are seeing
@@ -1692,6 +1693,7 @@ match_varspec (gfc_expr *primary, int equiv_flag)
       if (m != MATCH_YES)
 	return m;
 
+      gfc_gobble_whitespace ();
       if (equiv_flag && gfc_peek_char () == '(')
 	{
 	  tail = extend_ref (primary, tail);
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 6f91d5dcda72..dd6423694053 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2008-01-04  Tobias Burnus  <burnus@net-b.de>
+
+	PR fortran/34557
+	* gfortran.dg/equiv_substr.f90: New.
+
 2008-01-03  Tom Tromey  <tromey@redhat.com>
 
 	PR c/34457:
diff --git a/gcc/testsuite/gfortran.dg/equiv_substr.f90 b/gcc/testsuite/gfortran.dg/equiv_substr.f90
new file mode 100644
index 000000000000..cd186cf00155
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/equiv_substr.f90
@@ -0,0 +1,10 @@
+! { dg-do compile }
+!
+! PR fortran/34557
+!
+! Substrings with space before '(' were not properly parsed.
+!
+implicit none
+character :: A(2,2)*2, B(2)*3, C*5
+equivalence (A (2,1) (1:1), B (1) (2:3), C (3:5))
+end