aboutsummaryrefslogtreecommitdiff
path: root/gcc/fortran/data.c
diff options
context:
space:
mode:
authorPer Bothner <bothner@bothner.com>2006-06-01 16:18:34 +0000
committerPer Bothner <bothner@gcc.gnu.org>2006-06-01 09:18:34 -0700
commit45a82bd9573cb4b385dca060f340d535b2c04e5f (patch)
treeb79b8d4ea7e11b5d4679298140dcaf2a650275b8 /gcc/fortran/data.c
parente118597e1909cbb4d59374306ec219a386a8a42a (diff)
downloadgcc-45a82bd9573cb4b385dca060f340d535b2c04e5f.zip
gcc-45a82bd9573cb4b385dca060f340d535b2c04e5f.tar.gz
gcc-45a82bd9573cb4b385dca060f340d535b2c04e5f.tar.bz2
data.c (gfc_assign_data_value): Handle USE_MAPPED_LOCATION.
* data.c (gfc_assign_data_value): Handle USE_MAPPED_LOCATION. * scanner.c (gfc_gobble_whitespace): Likewise. From-SVN: r114310
Diffstat (limited to 'gcc/fortran/data.c')
-rw-r--r--gcc/fortran/data.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/gcc/fortran/data.c b/gcc/fortran/data.c
index 8fb8b5d..9f256bc 100644
--- a/gcc/fortran/data.c
+++ b/gcc/fortran/data.c
@@ -325,8 +325,14 @@ gfc_assign_data_value (gfc_expr * lvalue, gfc_expr * rvalue, mpz_t index)
/* Order in which the expressions arrive here depends on whether they
are from data statements or F95 style declarations. Therefore,
check which is the most recent. */
+#ifdef USE_MAPPED_LOCATION
+ expr = (LOCATION_LINE (init->where.lb->location)
+ > LOCATION_LINE (rvalue->where.lb->location))
+ ? init : rvalue;
+#else
expr = (init->where.lb->linenum > rvalue->where.lb->linenum) ?
init : rvalue;
+#endif
gfc_notify_std (GFC_STD_GNU, "Extension: re-initialization "
"of '%s' at %L", symbol->name, &expr->where);
return;