Fix is_same checks for ifx

Author: krystophny

src/fpm/dependency.f90

@@ -1416,7 +1416,10 @@ logical function dependency_tree_is_same(this,that)
 
           if (.not.(this%unit==other%unit)) return
           if (.not.(this%verbosity==other%verbosity)) return
-          if (.not.(this%dep_dir==other%dep_dir)) return
+          if (allocated(this%dep_dir) .neqv. allocated(other%dep_dir)) return
+          if (allocated(this%dep_dir)) then
+            if (.not.(this%dep_dir==other%dep_dir)) return
+          endif
           if (.not.(this%ndep==other%ndep)) return
           if (.not.(allocated(this%dep).eqv.allocated(other%dep))) return
           if (allocated(this%dep)) then
@@ -1425,7 +1428,10 @@ logical function dependency_tree_is_same(this,that)
                 if (.not.(this%dep(ii)==other%dep(ii))) return
              end do
           endif
-          if (.not.(this%cache==other%cache)) return
+          if (allocated(this%cache) .neqv. allocated(other%cache)) return
+          if (allocated(this%cache)) then
+            if (.not.(this%cache==other%cache)) return
+          endif
 
        class default
           ! Not the same type

src/fpm/git.f90

@@ -149,13 +149,15 @@ logical function git_is_same(this,that)
 
         select type (other=>that)
            type is (git_target_t)
-              if (.not. allocated(this%url) .or. .not. allocated(other%url) .or. &
-                  .not. allocated(this%object) .or. .not. allocated(other%object)) return
-
               if (.not.(this%descriptor==other%descriptor)) return
-              if (.not.(this%url==other%url)) return
-              if (.not.(this%object==other%object)) return
-
+              if (allocated(this%url) .neqv. allocated(other%url)) return
+              if (allocated(this%url) .and. allocated(other%url)) then
+                if (.not.(this%url==other%url)) return
+              end if
+              if (allocated(this%object) .neqv. allocated(other%object)) return
+              if (allocated(this%object) .and. allocated(other%object)) then
+                if (.not.(this%object==other%object)) return
+              end if
            class default
               ! Not the same type
               return

src/fpm/manifest/executable.f90

@@ -207,11 +207,17 @@ logical function exe_is_same(this,that)
            type is (executable_config_t)
               if (.not.this%link==other%link) return
               if (.not.allocated(this%name).eqv.allocated(other%name)) return
-              if (.not.this%name==other%name) return
+              if (allocated(this%name).and.allocated(other%name)) then
+                if (.not.this%name==other%name) return
+              end if
               if (.not.allocated(this%source_dir).eqv.allocated(other%source_dir)) return
-              if (.not.this%source_dir==other%source_dir) return
+              if (allocated(this%source_dir).and.allocated(other%source_dir)) then
+                if (.not.this%source_dir==other%source_dir) return
+              end if
               if (.not.allocated(this%main).eqv.allocated(other%main)) return
-              if (.not.this%main==other%main) return
+              if (allocated(this%main).and.allocated(other%main)) then
+                if (.not.this%main==other%main) return
+              end if
               if (.not.allocated(this%dependency).eqv.allocated(other%dependency)) return
               if (allocated(this%dependency)) then
                  if (.not.(size(this%dependency)==size(other%dependency))) return

src/fpm/manifest/fortran.f90

@@ -123,7 +123,9 @@ logical function fortran_is_same(this,that)
           if (this%implicit_typing.neqv.other%implicit_typing) return
           if (this%implicit_external.neqv.other%implicit_external) return
           if (.not.allocated(this%source_form).eqv.allocated(other%source_form)) return
-          if (.not.this%source_form==other%source_form) return
+          if (allocated(this%source_form).and.allocated(other%source_form)) then
+            if (.not.this%source_form==other%source_form) return
+          end if
        class default
           ! Not the same type
           return

src/fpm/manifest/library.f90

@@ -162,9 +162,13 @@ logical function library_is_same(this,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 (allocated(this%source_dir).and.allocated(other%source_dir)) then
+                if (.not.this%source_dir==other%source_dir) return
+              end if
               if (.not.allocated(this%build_script).eqv.allocated(other%build_script)) return
-              if (.not.this%build_script==other%build_script) return
+              if (allocated(this%build_script).and.allocated(other%build_script)) then
+                if (.not.this%build_script==other%build_script) return
+              end if
            class default
               ! Not the same type
               return

src/fpm/manifest/package.f90

@@ -541,16 +541,30 @@ logical function manifest_is_same(this,that)
 
       select type (other=>that)
          type is (package_config_t)
-
-            if (.not.this%name==other%name) return
+         if (allocated(this%name).neqv.allocated(other%name)) return
+            if (allocated(this%name) .and. allocated(other%name)) then
+                if (.not.this%name==other%name) return
+            end if
             if (.not.this%version==other%version) return
             if (.not.this%build==other%build) return
             if (.not.this%install==other%install) return
             if (.not.this%fortran==other%fortran) return
-            if (.not.this%license==other%license) return
-            if (.not.this%author==other%author) return
-            if (.not.this%maintainer==other%maintainer) return
-            if (.not.this%copyright==other%copyright) return
+            if (allocated(this%license).neqv.allocated(other%license)) return
+            if (allocated(this%license) .and. allocated(other%license)) then
+                if (.not.this%license==other%license) return
+            end if
+            if (allocated(this%author).neqv.allocated(other%author)) return
+            if (allocated(this%author) .and. allocated(other%author)) then
+                if (.not.this%author==other%author) return
+            end if
+            if (allocated(this%maintainer).neqv.allocated(other%maintainer)) return
+            if (allocated(this%maintainer) .and. allocated(other%maintainer)) then
+                if (.not.this%maintainer==other%maintainer) return
+            end if
+            if (allocated(this%copyright).neqv.allocated(other%copyright)) return
+            if (allocated(this%copyright) .and. allocated(other%copyright)) then
+                if (.not.this%copyright==other%copyright) return
+            end if
             if (allocated(this%library).neqv.allocated(other%library)) return
             if (allocated(this%library)) then
                 if (.not.this%library==other%library) return

src/fpm_compiler.F90

@@ -1265,8 +1265,10 @@ logical function ar_is_same(this,that)
 
     select type (other=>that)
        type is (archiver_t)
-
-          if (.not.(this%ar==other%ar)) return
+          if (allocated(this%ar).neqv.allocated(other%ar)) return
+          if (allocated(this%ar)) then
+            if (.not.(this%ar==other%ar)) return
+          end if
           if (.not.(this%use_response_file.eqv.other%use_response_file)) return
           if (.not.(this%echo.eqv.other%echo)) return
           if (.not.(this%verbose.eqv.other%verbose)) return
@@ -1339,9 +1341,18 @@ logical function compiler_is_same(this,that)
        type is (compiler_t)
 
           if (.not.(this%id==other%id)) return
-          if (.not.(this%fc==other%fc)) return
-          if (.not.(this%cc==other%cc)) return
-          if (.not.(this%cxx==other%cxx)) return
+          if (.not. allocated(this%fc).eqv.allocated(other%fc)) return
+          if (allocated(this%fc)) then
+            if (.not.(this%fc==other%fc)) return
+          end if
+          if (.not. allocated(this%cc).eqv.allocated(other%cc)) return
+          if (allocated(this%cc)) then
+            if (.not.(this%cc==other%cc)) return
+          end if
+          if (.not. allocated(this%cxx).eqv.allocated(other%cxx)) return
+          if (allocated(this%cxx)) then
+            if (.not.(this%cxx==other%cxx)) return
+          end if
           if (.not.(this%echo.eqv.other%echo)) return
           if (.not.(this%verbose.eqv.other%verbose)) return
 

src/fpm_model.f90

@@ -481,16 +481,36 @@ logical function srcfile_is_same(this,that)
 
     select type (other=>that)
        type is (srcfile_t)
-
-          if (.not.(this%file_name==other%file_name)) return
-          if (.not.(this%exe_name==other%exe_name)) return
+          if (allocated(this%file_name).neqv.allocated(other%file_name)) return
+          if (allocated(this%file_name).and.allocated(other%file_name)) then
+            if (.not.(this%file_name==other%file_name)) return
+          end if
+          if (allocated(this%exe_name).neqv.allocated(other%exe_name)) return
+          if (allocated(this%exe_name).and.allocated(other%exe_name)) then
+            if (.not.(this%exe_name==other%exe_name)) return
+          end if
           if (.not.(this%unit_scope==other%unit_scope)) return
-          if (.not.(this%modules_provided==other%modules_provided)) return
+          if (allocated(this%modules_provided).neqv.allocated(other%modules_provided)) return
+          if (allocated(this%modules_provided).and.allocated(other%modules_provided)) then
+            if (.not.(this%modules_provided==other%modules_provided)) return
+          end if
           if (.not.(this%unit_type==other%unit_type)) return
-          if (.not.(this%parent_modules==other%parent_modules)) return
-          if (.not.(this%modules_used==other%modules_used)) return
-          if (.not.(this%include_dependencies==other%include_dependencies)) return
-          if (.not.(this%link_libraries==other%link_libraries)) return
+          if (allocated(this%parent_modules).neqv.allocated(other%parent_modules)) return
+          if (allocated(this%parent_modules).and.allocated(other%parent_modules)) then
+            if (.not.(this%parent_modules==other%parent_modules)) return
+          end if
+          if (allocated(this%modules_used).neqv.allocated(other%modules_used)) return
+          if (allocated(this%modules_used).and.allocated(other%modules_used)) then
+            if (.not.(this%modules_used==other%modules_used)) return
+          end if
+          if (allocated(this%include_dependencies).neqv.allocated(other%include_dependencies)) return
+          if (allocated(this%include_dependencies).and.allocated(other%include_dependencies)) then
+            if (.not.(this%include_dependencies==other%include_dependencies)) return
+          end if
+          if (allocated(this%link_libraries).neqv.allocated(other%link_libraries)) return
+          if (allocated(this%link_libraries).and.allocated(other%link_libraries)) then
+            if (.not.(this%link_libraries==other%link_libraries)) return
+          end if
           if (.not.(this%digest==other%digest)) return
 
        class default
@@ -599,7 +619,10 @@ logical function fft_is_same(this,that)
 
            if (.not.(this%implicit_typing.eqv.other%implicit_typing)) return
            if (.not.(this%implicit_external.eqv.other%implicit_external)) return
-           if (.not.(this%source_form==other%source_form)) return
+           if (allocated(this%source_form).neqv.allocated(other%source_form)) return
+           if (allocated(this%source_form).and.allocated(other%source_form)) then
+             if (.not.(this%source_form==other%source_form)) return
+           end if
 
        class default
           ! Not the same type
@@ -666,9 +689,11 @@ logical function package_is_same(this,that)
 
     select type (other=>that)
        type is (package_t)
-
-           if (.not.(this%name==other%name)) return
-           if (.not.(allocated(this%sources).eqv.allocated(other%sources))) return
+           if (allocated(this%name).neqv.allocated(other%name)) return
+           if (allocated(this%name)) then
+              if (.not.(this%name==other%name)) return
+           end if
+           if (allocated(this%sources).neqv.allocated(other%sources)) return
            if (allocated(this%sources)) then
               if (.not.(size(this%sources)==size(other%sources))) return
               do ii = 1, size(this%sources)
@@ -677,7 +702,10 @@ logical function package_is_same(this,that)
            end if
 
            if (.not.(this%preprocess==other%preprocess)) return
-           if (.not.(this%version==other%version)) return
+           if (allocated(this%version).neqv.allocated(other%version)) return
+           if (allocated(this%version)) then
+             if (.not.(this%version==other%version)) return
+           end if
 
            !> Module naming
            if (.not.(this%enforce_module_names.eqv.other%enforce_module_names)) return
@@ -851,7 +879,10 @@ logical function model_is_same(this,that)
     select type (other=>that)
        type is (fpm_model_t)
 
-           if (.not.(this%package_name==other%package_name)) return
+           if ((allocated(this%package_name).neqv.allocated(other%package_name))) return
+           if (allocated(this%package_name).and.allocated(other%package_name)) then
+             if (.not.(this%package_name==other%package_name)) return
+           end if
            if (.not.(allocated(this%packages).eqv.allocated(other%packages))) return
            if (allocated(this%packages)) then
                if (.not.(size(this%packages)==size(other%packages))) return
@@ -862,14 +893,38 @@ logical function model_is_same(this,that)
 
            if (.not.(this%compiler==other%compiler)) return
            if (.not.(this%archiver==other%archiver)) return
-           if (.not.(this%fortran_compile_flags==other%fortran_compile_flags)) return
-           if (.not.(this%c_compile_flags==other%c_compile_flags)) return
-           if (.not.(this%cxx_compile_flags==other%cxx_compile_flags)) return
-           if (.not.(this%link_flags==other%link_flags)) return
-           if (.not.(this%build_prefix==other%build_prefix)) return
-           if (.not.(this%include_dirs==other%include_dirs)) return
-           if (.not.(this%link_libraries==other%link_libraries)) return
-           if (.not.(this%external_modules==other%external_modules)) return
+           if (allocated(this%fortran_compile_flags).neqv.allocated(other%fortran_compile_flags)) return
+           if (allocated(this%fortran_compile_flags).and.allocated(other%fortran_compile_flags)) then
+             if (.not.(this%fortran_compile_flags==other%fortran_compile_flags)) return
+           end if
+           if (allocated(this%c_compile_flags).neqv.allocated(other%c_compile_flags)) return
+           if (allocated(this%c_compile_flags).and.allocated(other%c_compile_flags)) then
+             if (.not.(this%c_compile_flags==other%c_compile_flags)) return
+           end if
+           if (allocated(this%cxx_compile_flags).neqv.allocated(other%cxx_compile_flags)) return
+           if (allocated(this%cxx_compile_flags).and.allocated(other%cxx_compile_flags)) then
+             if (.not.(this%cxx_compile_flags==other%cxx_compile_flags)) return
+           end if
+           if (allocated(this%link_flags).neqv.allocated(other%link_flags)) return
+           if (allocated(this%link_flags).and.allocated(other%link_flags)) then
+             if (.not.(this%link_flags==other%link_flags)) return
+           end if
+           if (allocated(this%build_prefix).neqv.allocated(other%build_prefix)) return
+           if (allocated(this%build_prefix).and.allocated(other%build_prefix)) then
+             if (.not.(this%build_prefix==other%build_prefix)) return
+           end if
+           if (allocated(this%include_dirs).neqv.allocated(other%include_dirs)) return
+           if (allocated(this%include_dirs).and.allocated(other%include_dirs)) then
+             if (.not.(this%include_dirs==other%include_dirs)) return
+           end if
+           if (allocated(this%link_libraries).neqv.allocated(other%link_libraries)) return
+           if (allocated(this%link_libraries).and.allocated(other%link_libraries)) then
+             if (.not.(this%link_libraries==other%link_libraries)) return
+           end if
+           if (allocated(this%external_modules).neqv.allocated(other%external_modules)) return
+           if (allocated(this%external_modules).and.allocated(other%external_modules)) then
+             if (.not.(this%external_modules==other%external_modules)) return
+           end if
            if (.not.(this%deps==other%deps)) return
            if (.not.(this%include_tests.eqv.other%include_tests)) return
            if (.not.(this%enforce_module_names.eqv.other%enforce_module_names)) return