Skip to content

Commit 8c4fdae

Browse files
authored
Fix compilation error in ifort (#523)
1 parent 8ffe495 commit 8c4fdae

File tree

6 files changed

+14
-19
lines changed

6 files changed

+14
-19
lines changed

src/fpm/manifest/build.f90

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
module fpm_manifest_build
1313
use fpm_error, only : error_t, syntax_error, fatal_error
1414
use fpm_strings, only : string_t
15-
use fpm_toml, only : toml_table, toml_key, toml_stat, get_value
15+
use fpm_toml, only : toml_table, toml_key, toml_stat, get_value, get_list
1616
implicit none
1717
private
1818

@@ -87,10 +87,10 @@ subroutine new_build_config(self, table, error)
8787
end if
8888

8989

90-
call get_value(table, "link", self%link, error)
90+
call get_list(table, "link", self%link, error)
9191
if (allocated(error)) return
9292

93-
call get_value(table, "external-modules", self%external_modules, error)
93+
call get_list(table, "external-modules", self%external_modules, error)
9494
if (allocated(error)) return
9595

9696
end subroutine new_build_config

src/fpm/manifest/example.f90

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ module fpm_manifest_example
1818
use fpm_manifest_dependency, only : dependency_config_t, new_dependencies
1919
use fpm_manifest_executable, only : executable_config_t
2020
use fpm_error, only : error_t, syntax_error, bad_name_error
21-
use fpm_toml, only : toml_table, toml_key, toml_stat, get_value
21+
use fpm_toml, only : toml_table, toml_key, toml_stat, get_value, get_list
2222
implicit none
2323
private
2424

@@ -73,7 +73,7 @@ subroutine new_example(self, table, error)
7373
if (allocated(error)) return
7474
end if
7575

76-
call get_value(table, "link", self%link, error)
76+
call get_list(table, "link", self%link, error)
7777
if (allocated(error)) return
7878

7979
end subroutine new_example

src/fpm/manifest/executable.f90

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ module fpm_manifest_executable
1414
use fpm_manifest_dependency, only : dependency_config_t, new_dependencies
1515
use fpm_error, only : error_t, syntax_error, bad_name_error
1616
use fpm_strings, only : string_t
17-
use fpm_toml, only : toml_table, toml_key, toml_stat, get_value
17+
use fpm_toml, only : toml_table, toml_key, toml_stat, get_value, get_list
1818
implicit none
1919
private
2020

@@ -84,7 +84,7 @@ subroutine new_executable(self, table, error)
8484
if (allocated(error)) return
8585
end if
8686

87-
call get_value(table, "link", self%link, error)
87+
call get_list(table, "link", self%link, error)
8888
if (allocated(error)) return
8989

9090
end subroutine new_executable

src/fpm/manifest/library.f90

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
module fpm_manifest_library
1212
use fpm_error, only : error_t, syntax_error
1313
use fpm_strings, only: string_t, string_cat
14-
use fpm_toml, only : toml_table, toml_key, toml_stat, get_value
14+
use fpm_toml, only : toml_table, toml_key, toml_stat, get_value, get_list
1515
implicit none
1616
private
1717

@@ -59,7 +59,7 @@ subroutine new_library(self, table, error)
5959
call get_value(table, "source-dir", self%source_dir, "src")
6060
call get_value(table, "build-script", self%build_script)
6161

62-
call get_value(table, "include-dir", self%include_dir, error)
62+
call get_list(table, "include-dir", self%include_dir, error)
6363
if (allocated(error)) return
6464

6565
! Set default value of include-dir if not found in manifest

src/fpm/manifest/test.f90

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ module fpm_manifest_test
1818
use fpm_manifest_dependency, only : dependency_config_t, new_dependencies
1919
use fpm_manifest_executable, only : executable_config_t
2020
use fpm_error, only : error_t, syntax_error, bad_name_error
21-
use fpm_toml, only : toml_table, toml_key, toml_stat, get_value
21+
use fpm_toml, only : toml_table, toml_key, toml_stat, get_value, get_list
2222
implicit none
2323
private
2424

@@ -73,7 +73,7 @@ subroutine new_test(self, table, error)
7373
if (allocated(error)) return
7474
end if
7575

76-
call get_value(table, "link", self%link, error)
76+
call get_list(table, "link", self%link, error)
7777
if (allocated(error)) return
7878

7979
end subroutine new_test

src/fpm/toml.f90

+3-8
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,11 @@ module fpm_toml
2222
private
2323

2424
public :: read_package_file
25-
public :: toml_table, toml_array, toml_key, toml_stat, get_value, set_value
25+
public :: toml_table, toml_array, toml_key, toml_stat, get_value, set_value, get_list
2626
public :: new_table, add_table, add_array, len
2727
public :: toml_error, toml_serializer, toml_parse
2828

2929

30-
interface get_value
31-
module procedure :: get_child_value_string_list
32-
end interface get_value
33-
34-
3530
contains
3631

3732

@@ -71,7 +66,7 @@ subroutine read_package_file(table, manifest, error)
7166
end subroutine read_package_file
7267

7368

74-
subroutine get_child_value_string_list(table, key, list, error)
69+
subroutine get_list(table, key, list, error)
7570

7671
!> Instance of the TOML data structure
7772
type(toml_table), intent(inout) :: table
@@ -114,7 +109,7 @@ subroutine get_child_value_string_list(table, key, list, error)
114109
end if
115110
end if
116111

117-
end subroutine get_child_value_string_list
112+
end subroutine get_list
118113

119114

120115
end module fpm_toml

0 commit comments

Comments
 (0)