aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDominique d'Humieres <dominiq@gcc.gnu.org>2019-04-13 13:32:49 +0200
committerDominique d'Humieres <dominiq@gcc.gnu.org>2019-04-13 13:32:49 +0200
commit917971706faf51ccb0c7e369e139dbd63c3160a7 (patch)
treea659f850f16f4ea7dc3106e86bc106e22329872b
parent4b4f5ccdeee47a294a2a4642007f489076accc47 (diff)
downloadgcc-917971706faf51ccb0c7e369e139dbd63c3160a7.zip
gcc-917971706faf51ccb0c7e369e139dbd63c3160a7.tar.gz
gcc-917971706faf51ccb0c7e369e139dbd63c3160a7.tar.bz2
re PR fortran/79842 (i18n: subword translation in "Can't use the same %smodule")
2019-04-13 Dominique d'Humieres <dominiq@gcc.gnu.org> PR fortran/79842 * module.c (gfc_use_module): use complete sentences. From-SVN: r270338
-rw-r--r--gcc/fortran/ChangeLog5
-rw-r--r--gcc/fortran/module.c8
2 files changed, 11 insertions, 2 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 69e9009..ef6200c 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,8 @@
+2019-04-13 Dominique d'Humieres <dominiq@gcc.gnu.org>
+
+ PR fortran/79842
+ * module.c (gfc_use_module): use complete sentences.
+
2019-04-11 Thomas Koenig <tkoenig@gcc.gnu.org>
PR translation/89939
diff --git a/gcc/fortran/module.c b/gcc/fortran/module.c
index 3d4b17b..3e1ffedd8 100644
--- a/gcc/fortran/module.c
+++ b/gcc/fortran/module.c
@@ -7144,8 +7144,12 @@ gfc_use_module (gfc_use_list *module)
for (p = gfc_state_stack; p; p = p->previous)
if ((p->state == COMP_MODULE || p->state == COMP_SUBMODULE)
&& strcmp (p->sym->name, module_name) == 0)
- gfc_fatal_error ("Cannot USE the same %smodule we're building",
- p->state == COMP_SUBMODULE ? "sub" : "");
+ {
+ if (p->state == COMP_SUBMODULE)
+ gfc_fatal_error ("Cannot USE a submodule that is currently built");
+ else
+ gfc_fatal_error ("Cannot USE a module that is currently built");
+ }
init_pi_tree ();
init_true_name_tree ();