From: pault Date: Fri, 17 Jul 2015 17:26:42 +0000 (+0000) Subject: 2015-07-17 Paul Thomas X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8e93f21b9f9f22b3d2bd92df72b8446c876d79cd;p=thirdparty%2Fgcc.git 2015-07-17 Paul Thomas PR fortran/52846 * decl.c (gfc_match_end): Pick out declared submodule name from the composite identifier. * gfortran.h : Add 'submodule_name' to gfc_use_list structure. * module.c (gfc_match_submodule): Define submodule_name and add static 'submodule_name'. (gfc_match_submodule): Build up submodule filenames, using '@' as a delimiter. Store the output filename in 'submodule_name'. Similarly, the submodule identifier is built using '.' as an identifier. (gfc_dump_module): If current state is COMP_SUBMODULE, write to file 'submodule_name', using SUBMODULE_EXTENSION. (gfc_use_module): Similarly, use the 'submodule_name' field in the gfc_use_list structure and SUBMODULE_EXTENSION to read the implicitly used submodule files. 2015-07-17 Paul Thomas PR fortran/52846 * lib/fortran-modules.exp (proc cleanup-submodules): New procedure. * gfortran.dg/submodule_1.f08: Change extension and clean up the submodule files. * gfortran.dg/submodule_2.f08: ditto * gfortran.dg/submodule_6.f08: ditto * gfortran.dg/submodule_7.f08: ditto * gfortran.dg/submodule_8.f08: New test * gfortran.dg/submodule_9.f08: New test git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@225956 138bc75d-0d04-0410-961f-82ee72b054a4 --- diff --git a/gcc/testsuite/gfortran.dg/submodule_7.f90 b/gcc/testsuite/gfortran.dg/submodule_7.f08 similarity index 97% rename from gcc/testsuite/gfortran.dg/submodule_7.f90 rename to gcc/testsuite/gfortran.dg/submodule_7.f08 index fd1bee6296c2..a183f50e46cd 100644 --- a/gcc/testsuite/gfortran.dg/submodule_7.f90 +++ b/gcc/testsuite/gfortran.dg/submodule_7.f08 @@ -145,3 +145,5 @@ program main call verify_cleanup (c_1, c_2) !... end program main +! { dg-final { cleanup-submodules "color_points@color_points_a" } } +! { dg-final { cleanup-submodules "color_points@color_points_b" } }