aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMikael Morin <mikael@gcc.gnu.org>2011-11-04 00:12:54 +0000
committerMikael Morin <mikael@gcc.gnu.org>2011-11-04 00:12:54 +0000
commit00b9bf8b7def3842e0c41376887aa41a9cec5bc0 (patch)
tree1417a9179046e7b3b5786efebd656d57a78ec463
parentaa6ad95c057d748c351fc50cac9f710299e8be07 (diff)
downloadgcc-00b9bf8b7def3842e0c41376887aa41a9cec5bc0.zip
gcc-00b9bf8b7def3842e0c41376887aa41a9cec5bc0.tar.gz
gcc-00b9bf8b7def3842e0c41376887aa41a9cec5bc0.tar.bz2
array.c (match_subscript): Skip whitespaces before setting locus.
* array.c (match_subscript): Skip whitespaces before setting locus. * matchexp.c (match_level_1): Ditto. From-SVN: r180910
-rw-r--r--gcc/fortran/ChangeLog5
-rw-r--r--gcc/fortran/array.c1
-rw-r--r--gcc/fortran/matchexp.c1
3 files changed, 7 insertions, 0 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 86551b7..ed6a4df 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,5 +1,10 @@
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
diff --git a/gcc/fortran/array.c b/gcc/fortran/array.c
index 3e6b9d2..a1449fd 100644
--- 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;
+ gfc_gobble_whitespace ();
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
--- a/gcc/fortran/matchexp.c
+++ b/gcc/fortran/matchexp.c
@@ -201,6 +201,7 @@ match_level_1 (gfc_expr **result)
locus where;
match m;
+ gfc_gobble_whitespace ();
where = gfc_current_locus;
uop = NULL;
m = match_defined_operator (&uop);