OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

re PR fortran/52313 (useless error message for old version of .mod file) 

PR fortran/52313
	* module.c (gfc_use_module): Improve error messages.

From-SVN: r184864
This commit is contained in:
Francois-Xavier Coudert 2012-03-03 20:59:58 +00:00 committed by François-Xavier Coudert
parent 6230987eeb
commit d289d284ab
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gcc/fortran/ChangeLog
View File

@ -1,3 +1,8 @@
2012-03-03 Francois-Xavier Coudert <fxcoudert@gcc.gnu.org>
PR fortran/52313
* module.c (gfc_use_module): Improve error messages.
2012-03-03 Tobias Burnus <burnus@net-b.de>
PR fortran/48820

19
gcc/fortran/module.c
View File

@ -6090,22 +6090,17 @@ gfc_use_module (gfc_use_list *module)
parse_name (c);
if ((start == 1 && strcmp (atom_name, "GFORTRAN") != 0)
|| (start == 2 && strcmp (atom_name, " module") != 0))
gfc_fatal_error ("File '%s' opened at %C is not a GFORTRAN module "
"file", filename);
gfc_fatal_error ("File '%s' opened at %C is not a GNU Fortran"
" module file", filename);
if (start == 3)
{
if (strcmp (atom_name, " version") != 0
|| module_char () != ' '
|| parse_atom () != ATOM_STRING)
gfc_fatal_error ("Parse error when checking module version"
" for file '%s' opened at %C", filename);
if (strcmp (atom_string, MOD_VERSION))
{
gfc_fatal_error ("Wrong module version '%s' (expected '%s') "
"for file '%s' opened at %C", atom_string,
MOD_VERSION, filename);
}
|| parse_atom () != ATOM_STRING
|| strcmp (atom_string, MOD_VERSION))
gfc_fatal_error ("Cannot read module file '%s' opened at %C,"
" because it was created by an older"
" version of GNU Fortran", filename);
free (atom_string);
}