serialize library_config_t

Author: perazz

src/fpm/manifest/library.f90

@@ -10,16 +10,17 @@
 !>```
 module fpm_manifest_library
     use fpm_error, only : error_t, syntax_error
-    use fpm_strings, only: string_t, string_cat
-    use fpm_toml, only : toml_table, toml_key, toml_stat, get_value, get_list
+    use fpm_strings, only: string_t, string_cat, operator(==)
+    use fpm_toml, only : toml_table, toml_key, toml_stat, get_value, get_list, serializable_t, set_value, &
+                          set_list, set_string, get_value, get_list
     implicit none
     private
 
     public :: library_config_t, new_library
 
 
     !> Configuration meta data for a library
-    type :: library_config_t
+    type, extends(serializable_t) :: library_config_t
 
         !> Source path prefix
         character(len=:), allocatable :: source_dir
@@ -35,8 +36,15 @@ module fpm_manifest_library
         !> Print information on this instance
         procedure :: info
 
+        !> Serialization interface
+        procedure :: serializable_is_same => library_is_same
+        procedure :: dump_to_toml
+        procedure :: load_from_toml
+
     end type library_config_t
 
+    character(*), parameter, private :: class_name = 'library_config_t'
+
 
 contains
 
@@ -138,5 +146,69 @@ subroutine info(self, unit, verbosity)
 
     end subroutine info
 
+    logical function library_is_same(this,that)
+       class(library_config_t), intent(in) :: this
+       class(serializable_t), intent(in) :: that
+
+        library_is_same = .false.
+
+        select type (other=>that)
+           type is (library_config_t)
+              if (.not.this%include_dir==other%include_dir) return
+              if (.not.allocated(this%source_dir).eqv.allocated(other%source_dir)) return
+              if (.not.this%source_dir==other%source_dir) return
+              if (.not.allocated(this%build_script).eqv.allocated(other%build_script)) return
+              if (.not.this%build_script==other%build_script) return
+           class default
+              ! Not the same type
+              return
+        end select
+
+        !> All checks passed!
+        library_is_same = .true.
+
+    end function library_is_same
+
+    !> Dump install config to toml table
+    subroutine dump_to_toml(self, table, error)
+
+        !> Instance of the serializable object
+        class(library_config_t), intent(inout) :: self
+
+        !> Data structure
+        type(toml_table), intent(inout) :: table
+
+        !> Error handling
+        type(error_t), allocatable, intent(out) :: error
+
+        call set_string(table, "source-dir", self%source_dir, error, class_name)
+        if (allocated(error)) return
+        call set_string(table, "build-script", self%build_script, error, class_name)
+        if (allocated(error)) return
+        call set_list(table, "include-dir", self%include_dir, error)
+        if (allocated(error)) return
+
+    end subroutine dump_to_toml
+
+    !> Read install config from toml table (no checks made at this stage)
+    subroutine load_from_toml(self, table, error)
+
+        !> Instance of the serializable object
+        class(library_config_t), intent(inout) :: self
+
+        !> Data structure
+        type(toml_table), intent(inout) :: table
+
+        !> Error handling
+        type(error_t), allocatable, intent(out) :: error
+
+        call get_value(table, "source-dir", self%source_dir)
+        if (allocated(error)) return
+        call get_value(table, "build-script", self%build_script)
+        if (allocated(error)) return
+        call get_list(table, "include-dir", self%include_dir, error)
+
+    end subroutine load_from_toml
+
 
 end module fpm_manifest_library

test/fpm_test/test_toml.f90

@@ -9,6 +9,7 @@ module test_toml
     use fpm_manifest_dependency, only: dependency_config_t, dependency_destroy
     use fpm_manifest_install
     use fpm_manifest_fortran
+    use fpm_manifest_library
     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, &
@@ -47,6 +48,7 @@ subroutine collect_toml(testsuite)
            & new_unittest("serialize-dependency-tree-invalid2", dependency_tree_invalid2, should_fail=.true.), &
            & new_unittest("serialize-install-config", install_config_roundtrip), &
            & new_unittest("serialize-fortran-config", fortran_features_roundtrip), &
+           & new_unittest("serialize-library-config", library_config_roundtrip), &
            & new_unittest("serialize-string-array", string_array_roundtrip), &
            & new_unittest("serialize-fortran-features", fft_roundtrip), &
            & new_unittest("serialize-fortran-invalid", fft_invalid, should_fail=.true.), &
@@ -1175,8 +1177,6 @@ subroutine fortran_features_roundtrip(error)
 
         type(fortran_config_t) :: fortran
 
-        integer :: loop
-
         fortran%implicit_external = .true.
         fortran%implicit_typing = .false.
         fortran%source_form = 'free'
@@ -1189,4 +1189,27 @@ subroutine fortran_features_roundtrip(error)
 
     end subroutine fortran_features_roundtrip
 
+    subroutine library_config_roundtrip(error)
+
+        !> Error handling
+        type(error_t), allocatable, intent(out) :: error
+
+        type(library_config_t) :: lib
+
+        lib%source_dir = 'lib'
+        lib%include_dir = [string_t('a'),string_t('b')]
+
+        call lib%test_serialization('library_config: 1',error)
+        if (allocated(error)) return
+
+        lib%build_script = 'install.sh'
+
+        call lib%test_serialization('library_config: 2',error)
+        if (allocated(error)) return
+
+        deallocate(lib%include_dir)
+        call lib%test_serialization('library_config: 3',error)
+
+    end subroutine library_config_roundtrip
+
 end module test_toml