aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/fortran/ChangeLog6
-rw-r--r--gcc/fortran/resolve.c9
2 files changed, 11 insertions, 4 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 5c99ca7..8629cab 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,9 @@
+2017-03-15 David Malcolm <dmalcolm@redhat.com>
+
+ PR fortran/79860
+ * resolve.c (resolve_contained_fntype): Make error messages more
+ amenable to translation.
+
2017-03-06 Richard Biener <rguenther@suse.de>
PR fortran/79894
diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c
index 1fbc9f6..accb5a2 100644
--- a/gcc/fortran/resolve.c
+++ b/gcc/fortran/resolve.c
@@ -615,10 +615,11 @@ resolve_contained_fntype (gfc_symbol *sym, gfc_namespace *ns)
gcc_assert (ns->parent && ns->parent->proc_name);
module_proc = (ns->parent->proc_name->attr.flavor == FL_MODULE);
- gfc_error ("Character-valued %s %qs at %L must not be"
- " assumed length",
- module_proc ? _("module procedure")
- : _("internal function"),
+ gfc_error (module_proc
+ ? G_("Character-valued module procedure %qs at %L"
+ " must not be assumed length")
+ : G_("Character-valued internal function %qs at %L"
+ " must not be assumed length"),
sym->name, &sym->declared_at);
}
}