* array.c (match_subscript): Skip whitespaces before setting locus.

	* matchexp.c (match_level_1): Ditto.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@180910 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 86551b7..ed6a4df 100644 (file)
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,5 +1,10 @@
 2011-11-04  Mikael Morin  <mikael@gcc.gnu.org>
 
 2011-11-04  Mikael Morin  <mikael@gcc.gnu.org>
 

+       * array.c (match_subscript): Skip whitespaces before setting locus.
+       * matchexp.c (match_level_1): Ditto.
+
+2011-11-04  Mikael Morin  <mikael@gcc.gnu.org>
+

        * trans-intrinsic.c (gfc_conv_intrinsic_minmaxval): Set loop's
        temporary rank to the loop rank. Mark ss chains for multiple loop
        if necessary.  Use gfc_trans_scalarized_loop_boundary to end one loop
        * trans-intrinsic.c (gfc_conv_intrinsic_minmaxval): Set loop's
        temporary rank to the loop rank. Mark ss chains for multiple loop
        if necessary.  Use gfc_trans_scalarized_loop_boundary to end one loop

diff --git a/gcc/fortran/array.c b/gcc/fortran/array.c
index 3e6b9d2..a1449fd 100644 (file)
--- a/gcc/fortran/array.c
+++ b/gcc/fortran/array.c
@@ -70,6 +70,7 @@ match_subscript (gfc_array_ref *ar, int init, bool match_star)
 
   i = ar->dimen + ar->codimen;
 
 
   i = ar->dimen + ar->codimen;
 

+  gfc_gobble_whitespace ();

   ar->c_where[i] = gfc_current_locus;
   ar->start[i] = ar->end[i] = ar->stride[i] = NULL;
 
   ar->c_where[i] = gfc_current_locus;
   ar->start[i] = ar->end[i] = ar->stride[i] = NULL;
 

diff --git a/gcc/fortran/matchexp.c b/gcc/fortran/matchexp.c
index 8b99ce9..cd70dc0 100644 (file)
--- a/gcc/fortran/matchexp.c
+++ b/gcc/fortran/matchexp.c
@@ -201,6 +201,7 @@ match_level_1 (gfc_expr **result)
   locus where;
   match m;
 
   locus where;
   match m;
 

+  gfc_gobble_whitespace ();

   where = gfc_current_locus;
   uop = NULL;
   m = match_defined_operator (&uop);
   where = gfc_current_locus;
   uop = NULL;
   m = match_defined_operator (&uop);