| Message ID | F764A58C-AA29-436C-84CF-76794E0FCB84@lps.ens.fr |
|---|---|
| State | New |
| Headers | show |
| Series | PR 79842 - i18n: subword translation in "Can't use the same %smodule" | expand |
Committed as revision r270338. Dominique > Le 11 avr. 2019 à 11:54, Dominique d'Humières <dominiq@lps.ens.fr> a écrit : > > Hi all, > > I am planning to commit the following patch > > --- ../_clean/gcc/fortran/module.c 2019-03-21 20:46:46.000000000 +0100 > +++ gcc/fortran/module.c 2019-04-11 10:28:37.000000000 +0200 > @@ -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 (); > > While testing it I did not find any coverage of these errors in the test suite. > > TIA > > Dominique >
--- ../_clean/gcc/fortran/module.c 2019-03-21 20:46:46.000000000 +0100 +++ gcc/fortran/module.c 2019-04-11 10:28:37.000000000 +0200 @@ -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 ();