compare preprocessing configs in the cached manifest

Author: perazz

src/fpm/dependency.f90

@@ -63,6 +63,7 @@ module fpm_dependency
   use fpm_git, only: git_target_revision, git_target_default, git_revision, operator(==)
   use fpm_manifest, only: package_config_t, dependency_config_t, get_package_data
   use fpm_manifest_dependency, only: manifest_has_changed
+  use fpm_manifest_preprocess, only: operator(==)
   use fpm_strings, only: string_t, operator(.in.)
   use fpm_toml, only: toml_table, toml_key, toml_error, toml_serialize, &
                       get_value, set_value, add_table, toml_load, toml_stat
@@ -1227,13 +1228,14 @@ logical function dependency_has_changed(cached, manifest, verbosity, iunit) resu
         return
       end if
       do ip=1,size(cached%preprocess)
-         if (cached%preprocess(ip) /= manifest%preprocess(ip)) then
+         if (.not.(cached%preprocess(ip) == manifest%preprocess(ip))) then
             if (verbosity > 1) write (iunit, out_fmt) "PREPROCESS config has changed"
             return
          end if
       end do
     else
       if (verbosity > 1) write (iunit, out_fmt) "PREPROCESS has changed presence "
+      return
     end if
 
     !> All checks passed: the two dependencies have no differences

src/fpm/manifest/preprocess.f90

@@ -17,7 +17,7 @@ module fpm_manifest_preprocess
    implicit none
    private
 
-   public :: preprocess_config_t, new_preprocess_config, new_preprocessors
+   public :: preprocess_config_t, new_preprocess_config, new_preprocessors, operator(==)
 
    !> Configuration meta data for a preprocessor
    type :: preprocess_config_t
@@ -41,6 +41,10 @@ module fpm_manifest_preprocess
 
    end type preprocess_config_t
 
+   interface operator(==)
+       module procedure preprocess_is_same
+   end interface
+
 contains
 
    !> Construct a new preprocess configuration from TOML data structure
@@ -154,7 +158,7 @@ subroutine info(self, unit, verbosity)
          pr = 1
       end if
 
-      if (pr < 1) return 
+      if (pr < 1) return
 
       write(unit, fmt) "Preprocessor"
       if (allocated(self%name)) then
@@ -181,4 +185,47 @@ subroutine info(self, unit, verbosity)
 
    end subroutine info
 
+   logical function preprocess_is_same(this,that)
+      class(preprocess_config_t), intent(in) :: this
+      class(preprocess_config_t), intent(in) :: that
+
+      integer :: istr
+
+      preprocess_is_same = .false.
+
+      select type (other=>that)
+         type is (preprocess_config_t)
+            if (allocated(this%name).neqv.allocated(other%name)) return
+            if (allocated(this%name)) then
+                if (.not.(this%name==other%name)) return
+            endif
+            if (.not.(allocated(this%suffixes).eqv.allocated(other%suffixes))) return
+            if (allocated(this%suffixes)) then
+               do istr=1,size(this%suffixes)
+                  if (.not.(this%suffixes(istr)%s==other%suffixes(istr)%s)) return
+               end do
+            end if
+            if (.not.(allocated(this%directories).eqv.allocated(other%directories))) return
+            if (allocated(this%directories)) then
+               do istr=1,size(this%directories)
+                  if (.not.(this%directories(istr)%s==other%directories(istr)%s)) return
+               end do
+            end if
+            if (.not.(allocated(this%macros).eqv.allocated(other%macros))) return
+            if (allocated(this%macros)) then
+               do istr=1,size(this%macros)
+                  if (.not.(this%macros(istr)%s==other%macros(istr)%s)) return
+               end do
+            end if
+
+         class default
+            ! Not the same type
+            return
+      end select
+
+      !> All checks passed!
+      preprocess_is_same = .true.
+
+    end function preprocess_is_same
+
 end module fpm_manifest_preprocess