Merge branch 'fortran-lang:main' into main

Author: henilp105

src/fpm/dependency.f90

@@ -60,8 +60,7 @@ module fpm_dependency
   use fpm_error, only: error_t, fatal_error
   use fpm_filesystem, only: exists, join_path, mkdir, canon_path, windows_path, list_files, is_dir, basename, &
                             os_delete_dir, get_temp_filename
-  use fpm_git, only: git_target_revision, git_target_default, git_revision, operator(==), &
-                     serializable_t
+  use fpm_git, only: git_target_revision, git_target_default, git_revision, serializable_t
   use fpm_manifest, only: package_config_t, dependency_config_t, get_package_data
   use fpm_manifest_dependency, only: manifest_has_changed, dependency_destroy
   use fpm_manifest_preprocess, only: operator(==)

src/fpm/git.f90

@@ -62,11 +62,6 @@ module fpm_git
 
     end type git_target_t
 
-
-    interface operator(==)
-        module procedure git_target_eq
-    end interface
-
     !> Common output format for writing to the command line
     character(len=*), parameter :: out_fmt = '("#", *(1x, g0))'
 
@@ -144,18 +139,6 @@ function git_target_tag(url, tag) result(self)
 
     end function git_target_tag
 
-    !> Check that two git targets are equal
-    logical function git_target_eq(this,that) result(is_equal)
-
-        !> Two input git targets
-        type(git_target_t), intent(in) :: this,that
-
-        is_equal = this%descriptor == that%descriptor .and. &
-                   this%url        == that%url        .and. &
-                   this%object     == that%object
-
-    end function git_target_eq
-
     !> Check that two git targets are equal
     logical function git_is_same(this,that)
         class(git_target_t), intent(in) :: this

src/fpm/manifest/dependency.f90

@@ -25,7 +25,7 @@
 module fpm_manifest_dependency
     use fpm_error, only: error_t, syntax_error, fatal_error
     use fpm_git, only: git_target_t, git_target_tag, git_target_branch, &
-        & git_target_revision, git_target_default, operator(==), git_matches_manifest
+        & git_target_revision, git_target_default, git_matches_manifest
     use fpm_toml, only: toml_table, toml_key, toml_stat, get_value, check_keys, serializable_t, add_table, &
         & set_value, set_string
     use fpm_filesystem, only: windows_path, join_path

src/fpm/toml.f90

@@ -36,19 +36,19 @@ module fpm_toml
         contains
 
         !> Dump to TOML table, unit, file
-        procedure(to_toml), deferred, private :: dump_to_toml
+        procedure(to_toml), deferred :: dump_to_toml
         procedure, non_overridable, private :: dump_to_file
         procedure, non_overridable, private :: dump_to_unit
         generic :: dump => dump_to_toml, dump_to_file, dump_to_unit
 
         !> Load from TOML table, unit, file
-        procedure(from_toml), deferred, private :: load_from_toml
+        procedure(from_toml), deferred :: load_from_toml
         procedure, non_overridable, private :: load_from_file
         procedure, non_overridable, private :: load_from_unit
         generic :: load => load_from_toml, load_from_file, load_from_unit
 
         !> Serializable entities need a way to check that they're equal
-        procedure(is_equal), deferred, private :: serializable_is_same
+        procedure(is_equal), deferred :: serializable_is_same
         generic :: operator(==) => serializable_is_same
 
         !> Test load/write roundtrip
@@ -256,7 +256,7 @@ subroutine load_from_unit(self, unit, error, json)
         !> Optional JSON format
         logical, optional, intent(in) :: json
 
-        type(toml_error), allocatable :: toml_error
+        type(toml_error), allocatable :: local_error
         type(toml_table), allocatable :: table
         type(toml_table), pointer     :: jtable
         class(toml_value), allocatable :: object
@@ -267,10 +267,10 @@ subroutine load_from_unit(self, unit, error, json)
         if (is_json) then
 
            !> init JSON interpreter
-           call json_load(object, unit, error=toml_error)
-           if (allocated(toml_error)) then
+           call json_load(object, unit, error=local_error)
+           if (allocated(local_error)) then
               allocate (error)
-              call move_alloc(toml_error%message, error%message)
+              call move_alloc(local_error%message, error%message)
               return
            end if
 
@@ -286,11 +286,11 @@ subroutine load_from_unit(self, unit, error, json)
         else
 
            !> use default TOML parser
-           call toml_load(table, unit, error=toml_error)
+           call toml_load(table, unit, error=local_error)
 
-           if (allocated(toml_error)) then
+           if (allocated(local_error)) then
               allocate (error)
-              call move_alloc(toml_error%message, error%message)
+              call move_alloc(local_error%message, error%message)
               return
            end if
 
@@ -454,7 +454,7 @@ subroutine set_character(table, key, var, error, whereAt)
         character(len=*), intent(in) :: key
 
         !> The character variable
-        character(len=:), allocatable, intent(in) :: var
+        character(len=*), optional, intent(in) :: var
 
         !> Error handling
         type(error_t), allocatable, intent(out) :: error
@@ -471,7 +471,7 @@ subroutine set_character(table, key, var, error, whereAt)
             return
         end if
 
-        if (allocated(var)) then
+        if (present(var)) then
             call set_value(table, key, var, ierr)
             if (ierr/=toml_stat%success) then
                 call fatal_error(error,'cannot set character key <'//key//'> in TOML table')