From 41cc1dd00efd0187e146687e655ae86d4e208c7f Mon Sep 17 00:00:00 2001 From: Janus Weil Date: Mon, 15 Dec 2014 11:34:46 +0100 Subject: re PR fortran/63674 ([F03] procedure pointer and non/pure procedure) 2014-12-15 Janus Weil PR fortran/63674 * resolve.c (check_pure_function): Rewording in error message. 2014-12-15 Janus Weil PR fortran/63674 * gfortran.dg/forall_5.f90: Modified error message. * gfortran.dg/proc_ptr_comp_39.f90: Ditto. * gfortran.dg/pure_dummy_length_1.f90: Ditto. * gfortran.dg/stfunc_6.f90: Ditto. * gfortran.dg/typebound_operator_4.f90: Ditto. From-SVN: r218738 --- gcc/fortran/ChangeLog | 5 +++++ gcc/fortran/resolve.c | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) (limited to 'gcc/fortran') diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 24bddef..8b10a48 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,8 @@ +2014-12-15 Janus Weil + + PR fortran/63674 + * resolve.c (check_pure_function): Rewording in error message. + 2014-12-14 Janus Weil PR fortran/63674 diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c index 6a0a869..fec36c9 100644 --- a/gcc/fortran/resolve.c +++ b/gcc/fortran/resolve.c @@ -2808,7 +2808,7 @@ pure_stmt_function (gfc_expr *e, gfc_symbol *sym) } -/* Check if a non-pure function function is allowed in the current context. */ +/* Check if an impure function is allowed in the current context. */ static bool check_pure_function (gfc_expr *e) { @@ -2817,21 +2817,21 @@ static bool check_pure_function (gfc_expr *e) { if (forall_flag) { - gfc_error ("Reference to non-PURE function %qs at %L inside a " + gfc_error ("Reference to impure function %qs at %L inside a " "FORALL %s", name, &e->where, forall_flag == 2 ? "mask" : "block"); return false; } else if (gfc_do_concurrent_flag) { - gfc_error ("Reference to non-PURE function %qs at %L inside a " + gfc_error ("Reference to impure function %qs at %L inside a " "DO CONCURRENT %s", name, &e->where, gfc_do_concurrent_flag == 2 ? "mask" : "block"); return false; } else if (gfc_pure (NULL)) { - gfc_error ("Reference to non-PURE function %qs at %L " + gfc_error ("Reference to impure function %qs at %L " "within a PURE procedure", name, &e->where); return false; } -- cgit v1.1