remove duplicate class fortran_features_t, replace with fortran_config_t (#1175)

Author: perazz

src/fpm.f90

@@ -9,7 +9,7 @@ module fpm
 use fpm_dependency, only : new_dependency_tree
 use fpm_filesystem, only: is_dir, join_path, list_files, exists, &
                    basename, filewrite, mkdir, run, os_delete_dir
-use fpm_model, only: fpm_model_t, srcfile_t, show_model, fortran_features_t, &
+use fpm_model, only: fpm_model_t, srcfile_t, show_model, &
                     FPM_SCOPE_UNKNOWN, FPM_SCOPE_LIB, FPM_SCOPE_DEP, &
                     FPM_SCOPE_APP, FPM_SCOPE_EXAMPLE, FPM_SCOPE_TEST
 use fpm_compiler, only: new_compiler, new_archiver, set_cpp_preprocessor_flags

src/fpm_model.f90

@@ -46,10 +46,11 @@ module fpm_model
 use fpm_error, only: error_t, fatal_error
 use fpm_environment, only: OS_WINDOWS,OS_MACOS
 use fpm_manifest_preprocess, only: preprocess_config_t
+use fpm_manifest_fortran, only: fortran_config_t
 implicit none
 
 private
-public :: fpm_model_t, srcfile_t, show_model, fortran_features_t, package_t
+public :: fpm_model_t, srcfile_t, show_model, fortran_config_t, package_t
 
 public :: FPM_UNIT_UNKNOWN, FPM_UNIT_PROGRAM, FPM_UNIT_MODULE, &
           FPM_UNIT_SUBMODULE, FPM_UNIT_SUBPROGRAM, FPM_UNIT_CSOURCE, &
@@ -86,27 +87,6 @@ module fpm_model
 integer, parameter :: FPM_SCOPE_TEST = 4
 integer, parameter :: FPM_SCOPE_EXAMPLE = 5
 
-!> Enabled Fortran language features
-type, extends(serializable_t) :: fortran_features_t
-
-    !> Use default implicit typing
-    logical :: implicit_typing = .false.
-
-    !> Use implicit external interface
-    logical :: implicit_external = .false.
-
-    !> Form to use for all Fortran sources
-    character(:), allocatable :: source_form
-
-    contains
-
-        !> Serialization interface
-        procedure :: serializable_is_same => fft_is_same
-        procedure :: dump_to_toml   => fft_dump_to_toml
-        procedure :: load_from_toml => fft_load_from_toml
-
-end type fortran_features_t
-
 !> Type for describing a source file
 type, extends(serializable_t) :: srcfile_t
     !> File path relative to cwd
@@ -171,7 +151,7 @@ module fpm_model
     type(string_t) :: module_prefix
 
     !> Language features
-    type(fortran_features_t) :: features
+    type(fortran_config_t) :: features
 
     contains
 
@@ -614,77 +594,6 @@ subroutine srcfile_load_from_toml(self, table, error)
 
 end subroutine srcfile_load_from_toml
 
-!> Check that two fortran feature objects are equal
-logical function fft_is_same(this,that)
-    class(fortran_features_t), intent(in) :: this
-    class(serializable_t), intent(in) :: that
-
-    fft_is_same = .false.
-
-    select type (other=>that)
-       type is (fortran_features_t)
-
-           if (.not.(this%implicit_typing.eqv.other%implicit_typing)) return
-           if (.not.(this%implicit_external.eqv.other%implicit_external)) return
-           if (allocated(this%source_form).neqv.allocated(other%source_form)) return
-           if (allocated(this%source_form)) then
-             if (.not.(this%source_form==other%source_form)) return
-           end if
-
-       class default
-          ! Not the same type
-          return
-    end select
-
-    !> All checks passed!
-    fft_is_same = .true.
-
-end function fft_is_same
-
-!> Dump fortran features to toml table
-subroutine fft_dump_to_toml(self, table, error)
-
-    !> Instance of the serializable object
-    class(fortran_features_t), intent(inout) :: self
-
-    !> Data structure
-    type(toml_table), intent(inout) :: table
-
-    !> Error handling
-    type(error_t), allocatable, intent(out) :: error
-
-    call set_value(table, "implicit-typing", self%implicit_typing, error, 'fortran_features_t')
-    if (allocated(error)) return
-    call set_value(table, "implicit-external", self%implicit_external, error, 'fortran_features_t')
-    if (allocated(error)) return
-    call set_string(table, "source-form", self%source_form, error, 'fortran_features_t')
-    if (allocated(error)) return
-
-end subroutine fft_dump_to_toml
-
-!> Read dependency from toml table (no checks made at this stage)
-subroutine fft_load_from_toml(self, table, error)
-
-    !> Instance of the serializable object
-    class(fortran_features_t), intent(inout) :: self
-
-    !> Data structure
-    type(toml_table), intent(inout) :: table
-
-    !> Error handling
-    type(error_t), allocatable, intent(out) :: error
-
-    integer :: ierr
-
-    call get_value(table, "implicit-typing", self%implicit_typing, error, 'fortran_features_t')
-    if (allocated(error)) return
-    call get_value(table, "implicit-external", self%implicit_external, error, 'fortran_features_t')
-    if (allocated(error)) return
-    ! Return unallocated value if not present
-    call get_value(table, "source-form", self%source_form)
-
-end subroutine fft_load_from_toml
-
 !> Check that two package objects are equal
 logical function package_is_same(this,that)
     class(package_t), intent(in) :: this

src/fpm_targets.f90

@@ -123,7 +123,7 @@ module fpm_targets
     logical :: skip = .false.
 
     !> Language features
-    type(fortran_features_t) :: features
+    type(fortran_config_t) :: features
 
     !> Targets in the same schedule group are guaranteed to be independent
     integer :: schedule = -1
@@ -570,7 +570,7 @@ type(build_target_ptr) function new_target(package, type, output_name, source, l
     character(*), intent(in) :: output_name
     type(srcfile_t), intent(in), optional :: source
     type(string_t), intent(in), optional :: link_libraries(:)
-    type(fortran_features_t), intent(in), optional :: features
+    type(fortran_config_t), intent(in), optional :: features
     type(preprocess_config_t), intent(in), optional :: preprocess
     type(version_t), intent(in), optional :: version
     character(*), intent(in), optional :: output_dir
@@ -607,7 +607,7 @@ subroutine add_new_target(targets, package, type, output_name, source, link_libr
     character(*), intent(in) :: output_name
     type(srcfile_t), intent(in), optional :: source
     type(string_t), intent(in), optional :: link_libraries(:)
-    type(fortran_features_t), intent(in), optional :: features
+    type(fortran_config_t), intent(in), optional :: features
     type(preprocess_config_t), intent(in), optional :: preprocess
     type(version_t), intent(in), optional :: version
     character(*), intent(in), optional :: output_dir
@@ -1419,7 +1419,7 @@ end subroutine filter_modules
 
 function get_feature_flags(compiler, features) result(flags)
     type(compiler_t), intent(in) :: compiler
-    type(fortran_features_t), intent(in) :: features
+    type(fortran_config_t), intent(in) :: features
     character(:), allocatable :: flags
 
     flags = ""

src/metapackage/fpm_meta_base.f90

@@ -1,7 +1,7 @@
 module fpm_meta_base
     use fpm_error, only: error_t, fatal_error
     use fpm_versioning, only: version_t
-    use fpm_model, only: fpm_model_t, fortran_features_t
+    use fpm_model, only: fpm_model_t, fortran_config_t
     use fpm_command_line, only: fpm_cmd_settings, fpm_run_settings
     use fpm_manifest_dependency, only: dependency_config_t
     use fpm_manifest_preprocess, only: preprocess_config_t
@@ -47,7 +47,7 @@ module fpm_meta_base
         type(string_t), allocatable :: external_modules(:)
 
         !> Special fortran features
-        type(fortran_features_t), allocatable :: fortran
+        type(fortran_config_t), allocatable :: fortran
 
         !> Preprocessor configuration
         type(preprocess_config_t), allocatable :: preprocess

test/fpm_test/test_toml.f90

@@ -20,7 +20,7 @@ module test_toml
     use fpm_manifest_profile, only: file_scope_flag
     use fpm_versioning, only: new_version
     use fpm_strings, only: string_t, operator(==), split
-    use fpm_model, only: fortran_features_t, package_t, FPM_SCOPE_LIB, FPM_UNIT_MODULE, fpm_model_t, &
+    use fpm_model, only: fortran_config_t, package_t, FPM_SCOPE_LIB, FPM_UNIT_MODULE, fpm_model_t, &
          & srcfile_t
     use fpm_compiler, only: archiver_t, compiler_t, id_gcc
     use fpm_error, only: fatal_error
@@ -605,15 +605,15 @@ subroutine fft_roundtrip(error)
         !> Error handling
         type(error_t), allocatable, intent(out) :: error
 
-        type(fortran_features_t) :: fortran
+        type(fortran_config_t) :: fortran
 
         !> Default object
-        call fortran%test_serialization('fortran_features_t: default object',error)
+        call fortran%test_serialization('fortran_config_t: default object',error)
         if (allocated(error)) return
 
         !> Set form
         fortran%source_form = "free"
-        call fortran%test_serialization('fortran_features_t: with form',error)
+        call fortran%test_serialization('fortran_config_t: with form',error)
         if (allocated(error)) return
 
     end subroutine fft_roundtrip
@@ -624,7 +624,7 @@ subroutine fft_invalid(error)
         !> Error handling
         type(error_t), allocatable, intent(out) :: error
 
-        type(fortran_features_t) :: fortran
+        type(fortran_config_t) :: fortran
         type(toml_table), allocatable :: table
 
         character(len=*), parameter :: toml = 'implicit-typing = false '//NL//&