diff options
| author | Tobias Burnus <burnus@net-b.de> | 2013-05-29 15:15:16 +0200 |
|---|---|---|
| committer | Tobias Burnus <burnus@gcc.gnu.org> | 2013-05-29 15:15:16 +0200 |
| commit | 16023efc1e94fcedcd76bef886c266a30976dbde (patch) | |
| tree | d9668ce9a676b9aa3ca7f365ef44fccebd997edc /gcc/fortran/module.c | |
| parent | a5350ddc612732cc2a3cb313ed86d4c6dbf7907a (diff) | |
| download | gcc-16023efc1e94fcedcd76bef886c266a30976dbde.zip gcc-16023efc1e94fcedcd76bef886c266a30976dbde.tar.gz gcc-16023efc1e94fcedcd76bef886c266a30976dbde.tar.bz2 | |
re PR fortran/37336 ([F03] Finish derived-type finalization)
2013-05-28 Tobias Burnus <burnus@net-b.de>
PR fortran/37336
* class.c (finalize_component): Fix coarray array refs.
(generate_finalization_wrapper): Only gfc_convert_type_warn
when the kind value is different.
(gfc_find_intrinsic_vtab): _copy's dst is now intent(inout).
(gfc_find_derived_vtab): Ditto. Enable finalization-wrapper
generation.
* module.c (MOD_VERSION): Bump.
(gfc_dump_module, gfc_use_module): Remove empty line in .mod.
* trans-array.c (gfc_conv_descriptor_token): Accept
* nonrestricted
void pointer.
(gfc_array_allocate, structure_alloc_comps): Don't nullify for
BT_CLASS allocations.
* trans-stmt.c (gfc_trans_allocate): Ditto.
2013-05-28 Tobias Burnus <burnus@net-b.de>
PR fortran/37336
* gfortran.dg/auto_dealloc_2.f90: Update _free count in the
* dump.
* gfortran.dg/class_19.f03: Ditto.
From-SVN: r199409
Diffstat (limited to 'gcc/fortran/module.c')
| -rw-r--r-- | gcc/fortran/module.c | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/gcc/fortran/module.c b/gcc/fortran/module.c index bc31671..c390a95 100644 --- a/gcc/fortran/module.c +++ b/gcc/fortran/module.c @@ -80,10 +80,8 @@ along with GCC; see the file COPYING3. If not see #define MODULE_EXTENSION ".mod" /* Don't put any single quote (') in MOD_VERSION, if you want it to be - recognized. - TODO: When the version is bumped, remove the extra empty line at - the beginning of module files. */ -#define MOD_VERSION "10" + recognized. */ +#define MOD_VERSION "11" /* Structure that describes a position within a module file. */ @@ -5567,14 +5565,9 @@ gfc_dump_module (const char *name, int dump_flag) gfc_fatal_error ("Can't open module file '%s' for writing at %C: %s", filename_tmp, xstrerror (errno)); - /* Write the header. - FIXME: For backwards compatibility with the old uncompressed - module format, write an extra empty line. When the module version - is bumped, this can be removed. */ - gzprintf (module_fp, "GFORTRAN module version '%s' created from %s\n\n", + gzprintf (module_fp, "GFORTRAN module version '%s' created from %s\n", MOD_VERSION, gfc_source_file); - /* Write the module itself. */ iomode = IO_OUTPUT; module_name = gfc_get_string (name); @@ -6364,10 +6357,10 @@ gfc_use_module (gfc_use_list *module) read_module_to_tmpbuf (); gzclose (module_fp); - /* Skip the first two lines of the module, after checking that this is + /* Skip the first line of the module, after checking that this is a gfortran module file. */ line = 0; - while (line < 2) + while (line < 1) { c = module_char (); if (c == EOF) |