aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--app/main.f902
-rw-r--r--src/fpm/cmd/install.f902
-rw-r--r--src/fpm/dependency.f909
-rw-r--r--src/fpm/manifest/executable.f902
-rw-r--r--src/fpm/manifest/package.f902
-rw-r--r--src/fpm/versioning.f905
-rw-r--r--src/fpm_backend.f908
-rw-r--r--src/fpm_command_line.f9050
-rw-r--r--src/fpm_filesystem.f906
-rw-r--r--src/fpm_model.f901
-rw-r--r--src/fpm_strings.f904
-rw-r--r--src/fpm_targets.f903
-rw-r--r--test/fpm_test/test_backend.f9026
-rw-r--r--test/fpm_test/test_filesystem.f902
-rw-r--r--test/fpm_test/test_manifest.f902
-rw-r--r--test/fpm_test/test_module_dependencies.f904
-rw-r--r--test/fpm_test/test_package_dependencies.f9010
-rw-r--r--test/fpm_test/test_source_parsing.f902
-rw-r--r--test/fpm_test/test_versioning.f901
-rw-r--r--test/help_test/help_test.f902
20 files changed, 60 insertions, 83 deletions
diff --git a/app/main.f90 b/app/main.f90
index 5600f98..c7c9258 100644
--- a/app/main.f90
+++ b/app/main.f90
@@ -89,8 +89,6 @@ contains
character(len=*), intent(in) :: dir
logical :: has_manifest
- character(len=:), allocatable :: manifest
-
has_manifest = exists(join_path(dir, "fpm.toml"))
end function has_manifest
diff --git a/src/fpm/cmd/install.f90 b/src/fpm/cmd/install.f90
index e53609b..4c8596e 100644
--- a/src/fpm/cmd/install.f90
+++ b/src/fpm/cmd/install.f90
@@ -27,7 +27,7 @@ contains
type(fpm_model_t) :: model
type(build_target_ptr), allocatable :: targets(:)
type(installer_t) :: installer
- character(len=:), allocatable :: lib, exe, dir
+ character(len=:), allocatable :: lib, dir
logical :: installable
call get_package_data(package, "fpm.toml", error, apply_defaults=.true.)
diff --git a/src/fpm/dependency.f90 b/src/fpm/dependency.f90
index 144ffbe..bd85b6f 100644
--- a/src/fpm/dependency.f90
+++ b/src/fpm/dependency.f90
@@ -233,7 +233,6 @@ contains
type(dependency_config_t) :: dependency
character(len=:), allocatable :: root
- logical :: main
if (allocated(self%cache)) then
call self%load(self%cache, error)
@@ -386,8 +385,7 @@ contains
type(error_t), allocatable, intent(out) :: error
integer :: id
- type(package_config_t) :: package
- character(len=:), allocatable :: manifest, proj_dir, revision, root
+ character(len=:), allocatable :: proj_dir, root
id = self%find(name)
root = "."
@@ -507,8 +505,6 @@ contains
!> Index of the dependency
integer :: pos
- integer :: ii
-
pos = self%find(dependency%name)
end function find_dependency
@@ -540,7 +536,6 @@ contains
class(dependency_tree_t), intent(in) :: self
!> All dependencies are updated
logical :: finished
- integer :: ii
finished = all(self%dep(:self%ndep)%done)
@@ -561,7 +556,6 @@ contains
!> Error handling
type(error_t), allocatable, intent(out) :: error
- character(len=:), allocatable :: url
logical :: update
update = .false.
@@ -649,7 +643,6 @@ contains
character(len=:), allocatable :: version, url, obj, rev, proj_dir
type(toml_key), allocatable :: list(:)
type(toml_table), pointer :: ptr
- type(dependency_config_t) :: dep
call table%get_keys(list)
diff --git a/src/fpm/manifest/executable.f90 b/src/fpm/manifest/executable.f90
index 60c20ec..e81ab8e 100644
--- a/src/fpm/manifest/executable.f90
+++ b/src/fpm/manifest/executable.f90
@@ -13,7 +13,7 @@
module fpm_manifest_executable
use fpm_manifest_dependency, only : dependency_config_t, new_dependencies
use fpm_error, only : error_t, syntax_error, bad_name_error
- use fpm_strings, only : string_t
+ use fpm_strings, only : string_t
use fpm_toml, only : toml_table, toml_key, toml_stat, get_value
implicit none
private
diff --git a/src/fpm/manifest/package.f90 b/src/fpm/manifest/package.f90
index 1f85144..dba4d21 100644
--- a/src/fpm/manifest/package.f90
+++ b/src/fpm/manifest/package.f90
@@ -161,7 +161,7 @@ contains
end if
call new_install_config(self%install, child, error)
if (allocated(error)) return
-
+
call get_value(table, "version", version, "0")
call new_version(self%version, version, error)
if (allocated(error) .and. present(root)) then
diff --git a/src/fpm/versioning.f90 b/src/fpm/versioning.f90
index b24fc3c..da362ee 100644
--- a/src/fpm/versioning.f90
+++ b/src/fpm/versioning.f90
@@ -87,8 +87,7 @@ contains
!> Error handling
type(error_t), allocatable, intent(out) :: error
- character :: tok
- integer :: ii, istart, iend, stat, nn
+ integer :: istart, iend, stat, nn
integer :: num(max_limit)
logical :: is_number
@@ -147,7 +146,7 @@ contains
integer :: ii, nn
logical :: was_number
- character :: tok, last
+ character :: tok
was_number = is_number
nn = len(string)
diff --git a/src/fpm_backend.f90 b/src/fpm_backend.f90
index e82d847..4d0c709 100644
--- a/src/fpm_backend.f90
+++ b/src/fpm_backend.f90
@@ -83,7 +83,7 @@ subroutine build_package(targets,model)
! Check if build already failed
!$omp atomic read
skip_current = build_failed
-
+
if (.not.skip_current) then
call build_target(model,queue(j)%ptr,stat(j))
end if
@@ -126,8 +126,7 @@ end subroutine build_package
recursive subroutine sort_target(target)
type(build_target_t), intent(inout), target :: target
- integer :: i, j, fh, stat
- type(build_target_t), pointer :: exe_obj
+ integer :: i, fh, stat
! Check if target has already been processed (as a dependency)
if (target%sorted .or. target%skip) then
@@ -257,8 +256,7 @@ subroutine build_target(model,target,stat)
type(build_target_t), intent(in), target :: target
integer, intent(out) :: stat
- integer :: ilib, fh
- character(:), allocatable :: link_flags
+ integer :: fh
if (.not.exists(dirname(target%output_file))) then
call mkdir(dirname(target%output_file))
diff --git a/src/fpm_command_line.f90 b/src/fpm_command_line.f90
index 2ed7ac6..86e6d5d 100644
--- a/src/fpm_command_line.f90
+++ b/src/fpm_command_line.f90
@@ -537,17 +537,18 @@ contains
' ']
help_list_dash = [character(len=80) :: &
' ', &
- ' build [--compiler COMPILER_NAME] [--profile PROF] [--flag FFLAGS] [--list] ', &
+ ' build [--compiler COMPILER_NAME] [--profile PROF] [--flag FFLAGS] [--list] ', &
' help [NAME(s)] ', &
' new NAME [[--lib|--src] [--app] [--test] [--example]]| ', &
' [--full|--bare][--backfill] ', &
' update [NAME(s)] [--fetch-only] [--clean] [--verbose] ', &
' list [--list] ', &
- ' run [[--target] NAME(s) [--example] [--profile PROF] [--flag FFLAGS] [--all] ', &
+ ' run [[--target] NAME(s) [--example] [--profile PROF] [--flag FFLAGS] [--all] ', &
' [--runner "CMD"] [--compiler COMPILER_NAME] [--list] [-- ARGS] ', &
- ' test [[--target] NAME(s)] [--profile PROF] [--flag FFLAGS] [--runner "CMD"] [--list]', &
- ' [--compiler COMPILER_NAME] [-- ARGS] ', &
- ' install [--profile PROF] [--flag FFLAGS] [--no-rebuild] [--prefix PATH] [options] ', &
+ ' test [[--target] NAME(s)] [--profile PROF] [--flag FFLAGS] [--runner "CMD"] ', &
+ ' [--list] [--compiler COMPILER_NAME] [-- ARGS] ', &
+ ' install [--profile PROF] [--flag FFLAGS] [--no-rebuild] [--prefix PATH] ', &
+ ' [options] ', &
' ']
help_usage=[character(len=80) :: &
'' ]
@@ -652,20 +653,21 @@ contains
' + install Install project ', &
' ', &
' Their syntax is ', &
- ' ', &
- ' build [--profile PROF] [--flag FFLAGS] [--list] [--compiler COMPILER_NAME]', &
- ' new NAME [[--lib|--src] [--app] [--test] [--example]]| ', &
- ' [--full|--bare][--backfill] ', &
- ' update [NAME(s)] [--fetch-only] [--clean] ', &
- ' run [[--target] NAME(s)] [--profile PROF] [--flag FFLAGS] [--list] [--example]', &
- ' [--all] [--runner "CMD"] [--compiler COMPILER_NAME] [-- ARGS] ', &
- ' test [[--target] NAME(s)] [--profile PROF] [--flag FFLAGS] [--list] ', &
- ' [--runner "CMD"] [--compiler COMPILER_NAME] [-- ARGS] ', &
- ' help [NAME(s)] ', &
- ' list [--list] ', &
- ' install [--profile PROF] [--flag FFLAGS] [--no-rebuild] [--prefix PATH] [options]', &
- ' ', &
- 'SUBCOMMAND OPTIONS ', &
+ ' ', &
+ ' build [--profile PROF] [--flag FFLAGS] [--list] [--compiler COMPILER_NAME] ', &
+ ' new NAME [[--lib|--src] [--app] [--test] [--example]]| ', &
+ ' [--full|--bare][--backfill] ', &
+ ' update [NAME(s)] [--fetch-only] [--clean] ', &
+ ' run [[--target] NAME(s)] [--profile PROF] [--flag FFLAGS] [--list] [--all] ', &
+ ' [--example] [--runner "CMD"] [--compiler COMPILER_NAME] [-- ARGS] ', &
+ ' test [[--target] NAME(s)] [--profile PROF] [--flag FFLAGS] [--list] ', &
+ ' [--runner "CMD"] [--compiler COMPILER_NAME] [-- ARGS] ', &
+ ' help [NAME(s)] ', &
+ ' list [--list] ', &
+ ' install [--profile PROF] [--flag FFLAGS] [--no-rebuild] [--prefix PATH] ', &
+ ' [options] ', &
+ ' ', &
+ 'SUBCOMMAND OPTIONS ', &
' -C, --directory PATH', &
' Change working directory to PATH before running any command', &
' --profile PROF selects the compilation profile for the build.',&
@@ -730,11 +732,11 @@ contains
' fpm run ', &
' fpm run --example ', &
' fpm new --help ', &
- ' fpm run myprogram --profile release -- -x 10 -y 20 --title "my title"', &
- ' fpm install --prefix ~/.local ', &
- ' ', &
- 'SEE ALSO ', &
- ' ', &
+ ' fpm run myprogram --profile release -- -x 10 -y 20 --title "my title" ', &
+ ' fpm install --prefix ~/.local ', &
+ ' ', &
+ 'SEE ALSO ', &
+ ' ', &
' + The fpm(1) home page is at https://github.com/fortran-lang/fpm ', &
' + Registered fpm(1) packages are at https://fortran-lang.org/packages ', &
' + The fpm(1) TOML file format is described at ', &
diff --git a/src/fpm_filesystem.f90 b/src/fpm_filesystem.f90
index 2a32b54..284f558 100644
--- a/src/fpm_filesystem.f90
+++ b/src/fpm_filesystem.f90
@@ -45,7 +45,7 @@ end subroutine env_variable
!> Extract filename from path with/without suffix
function basename(path,suffix) result (base)
-
+
character(*), intent(In) :: path
logical, intent(in), optional :: suffix
character(:), allocatable :: base
@@ -90,7 +90,7 @@ function canon_path(path)
character(len=:), allocatable :: canon_path
character(len=:), allocatable :: nixpath
- integer :: ii, istart, iend, stat, nn, last
+ integer :: istart, iend, nn, last
logical :: is_path, absolute
nixpath = unix_path(path)
@@ -141,7 +141,7 @@ contains
logical, intent(inout) :: is_path
integer :: ii, nn
- character :: tok, last
+ character :: tok
nn = len(string)
diff --git a/src/fpm_model.f90 b/src/fpm_model.f90
index 9746e5f..49f598e 100644
--- a/src/fpm_model.f90
+++ b/src/fpm_model.f90
@@ -251,7 +251,6 @@ function info_srcfile_short(source) result(s)
! Prints a shortened version of srcfile_t
type(srcfile_t), intent(in) :: source
character(:), allocatable :: s
- integer :: i
s = "srcfile_t("
s = s // 'file_name="' // source%file_name // '"'
s = s // ", ...)"
diff --git a/src/fpm_strings.f90 b/src/fpm_strings.f90
index ee5c20a..efbf054 100644
--- a/src/fpm_strings.f90
+++ b/src/fpm_strings.f90
@@ -6,7 +6,7 @@
!!### Types
!! - **TYPE(STRING_T)** define a type to contain strings of variable length
!!### Type Conversions
-!! - [[F_STRING]] return Fortran **CHARACTER** variable when given a C-like array of
+!! - [[F_STRING]] return Fortran **CHARACTER** variable when given a C-like array of
!! single characters terminated with a C_NULL_CHAR **CHARACTER**
!! - [[STR]] Converts **INTEGER** or** LOGICAL** to **CHARACTER** string
!!### Case
@@ -14,7 +14,7 @@
!!### Parsing and joining
!! - [[SPLIT]] parse string on delimiter characters and store tokens into an allocatable array
!! - [[STRING_CAT]] Concatenate an array of **type(string_t)** into a single **CHARACTER** variable
-!! - [[JOIN]] append an array of **CHARACTER** variables into a single **CHARACTER** variable
+!! - [[JOIN]] append an array of **CHARACTER** variables into a single **CHARACTER** variable
!!### Testing
!! - [[STR_ENDS_WITH]] test if a **CHARACTER** string or array ends with a specified suffix
!! - [[STRING_ARRAY_CONTAINS]] Check if array of **TYPE(STRING_T)** matches a particular **CHARACTER** string
diff --git a/src/fpm_targets.f90 b/src/fpm_targets.f90
index 66bbdd5..d480866 100644
--- a/src/fpm_targets.f90
+++ b/src/fpm_targets.f90
@@ -160,7 +160,6 @@ subroutine build_target_list(targets,model)
integer :: i, j, n_source
character(:), allocatable :: xsuffix, exe_dir
- type(build_target_t), pointer :: dep
logical :: with_lib
! Check for empty build (e.g. header-only lib)
@@ -258,7 +257,6 @@ subroutine build_target_list(targets,model)
integer :: i
character(1), parameter :: filesep = '/'
- character(:), allocatable :: dir
object_file = canon_path(source%file_name)
@@ -285,7 +283,6 @@ subroutine add_target(targets,type,output_file,source,link_libraries)
type(string_t), intent(in), optional :: link_libraries(:)
integer :: i
- type(build_target_ptr), allocatable :: temp(:)
type(build_target_t), pointer :: new_target
if (.not.allocated(targets)) allocate(targets(0))
diff --git a/test/fpm_test/test_backend.f90 b/test/fpm_test/test_backend.f90
index 662e470..eea0460 100644
--- a/test/fpm_test/test_backend.f90
+++ b/test/fpm_test/test_backend.f90
@@ -28,7 +28,7 @@ contains
& new_unittest("schedule-targets", test_schedule_targets), &
& new_unittest("schedule-targets-empty", test_schedule_empty) &
]
-
+
end subroutine collect_backend
@@ -39,7 +39,7 @@ contains
type(error_t), allocatable, intent(out) :: error
type(build_target_ptr), allocatable :: targets(:)
-
+
integer :: i
targets = new_test_package()
@@ -98,7 +98,7 @@ contains
- !> Check incremental rebuild for existing archive
+ !> Check incremental rebuild for existing archive
!> all object sources are unmodified: all objects should be skipped
subroutine test_target_sort_skip_all(error)
@@ -106,7 +106,7 @@ contains
type(error_t), allocatable, intent(out) :: error
type(build_target_ptr), allocatable :: targets(:)
-
+
integer :: fh, i
targets = new_test_package()
@@ -162,7 +162,7 @@ contains
type(error_t), allocatable, intent(out) :: error
type(build_target_ptr), allocatable :: targets(:)
-
+
integer :: fh, i
targets = new_test_package()
@@ -212,7 +212,7 @@ contains
type(error_t), allocatable, intent(out) :: error
type(build_target_ptr), allocatable :: targets(:)
-
+
integer :: i, j
type(build_target_ptr), allocatable :: queue(:)
integer, allocatable :: schedule_ptr(:)
@@ -259,16 +259,16 @@ contains
do i=1,size(schedule_ptr)-1
do j=schedule_ptr(i),(schedule_ptr(i+1)-1)
-
+
if (queue(j)%ptr%schedule /= i) then
call test_failed(error,"Target scheduled in the wrong region")
return
end if
-
+
end do
-
+
end do
end subroutine test_schedule_targets
@@ -282,7 +282,7 @@ contains
type(error_t), allocatable, intent(out) :: error
type(build_target_ptr), allocatable :: targets(:)
-
+
integer :: i
type(build_target_ptr), allocatable :: queue(:)
integer, allocatable :: schedule_ptr(:)
@@ -310,7 +310,7 @@ contains
call test_failed(error,"Expecting an empty build queue, but not empty")
return
-
+
end if
! Check schedule loop is not entered
@@ -336,7 +336,7 @@ contains
call add_target(targets,FPM_TARGET_OBJECT,get_temp_filename())
call add_target(targets,FPM_TARGET_OBJECT,get_temp_filename())
-
+
! Library depends on all objects
call add_dependency(targets(1)%ptr,targets(2)%ptr)
call add_dependency(targets(1)%ptr,targets(3)%ptr)
@@ -350,4 +350,4 @@ contains
end function new_test_package
-end module test_backend \ No newline at end of file
+end module test_backend
diff --git a/test/fpm_test/test_filesystem.f90 b/test/fpm_test/test_filesystem.f90
index 5a7e18a..94eadda 100644
--- a/test/fpm_test/test_filesystem.f90
+++ b/test/fpm_test/test_filesystem.f90
@@ -18,7 +18,7 @@ contains
testsuite = [ &
& new_unittest("canon-path", test_canon_path) &
]
-
+
end subroutine collect_filesystem
diff --git a/test/fpm_test/test_manifest.f90 b/test/fpm_test/test_manifest.f90
index 0f64aca..6fde671 100644
--- a/test/fpm_test/test_manifest.f90
+++ b/test/fpm_test/test_manifest.f90
@@ -19,7 +19,7 @@ contains
!> Collection of tests
type(unittest_t), allocatable, intent(out) :: testsuite(:)
-
+
testsuite = [ &
& new_unittest("valid-manifest", test_valid_manifest), &
& new_unittest("invalid-manifest", test_invalid_manifest, should_fail=.true.), &
diff --git a/test/fpm_test/test_module_dependencies.f90 b/test/fpm_test/test_module_dependencies.f90
index 992f227..8600bf0 100644
--- a/test/fpm_test/test_module_dependencies.f90
+++ b/test/fpm_test/test_module_dependencies.f90
@@ -132,7 +132,6 @@ contains
integer, intent(in) :: exe_scope
type(error_t), allocatable, intent(out) :: error
- integer :: i
type(fpm_model_t) :: model
type(build_target_ptr), allocatable :: targets(:)
character(:), allocatable :: scope_str
@@ -193,7 +192,6 @@ contains
!> Error handling
type(error_t), allocatable, intent(out) :: error
- integer :: i
type(fpm_model_t) :: model
type(build_target_ptr), allocatable :: targets(:)
@@ -408,7 +406,7 @@ contains
uses=[string_t('app_mod')])
call targets_from_sources(targets,model,error)
-
+
end subroutine test_subdirectory_module_use
!> Check program with no duplicate modules
diff --git a/test/fpm_test/test_package_dependencies.f90 b/test/fpm_test/test_package_dependencies.f90
index b70ac13..a3192ff 100644
--- a/test/fpm_test/test_package_dependencies.f90
+++ b/test/fpm_test/test_package_dependencies.f90
@@ -25,7 +25,7 @@ contains
!> Collection of tests
type(unittest_t), allocatable, intent(out) :: testsuite(:)
-
+
testsuite = [ &
& new_unittest("cache-load-dump", test_cache_load_dump), &
& new_unittest("cache-dump-load", test_cache_dump_load), &
@@ -139,7 +139,6 @@ contains
type(toml_table) :: table
type(toml_table), pointer :: ptr
- type(toml_key), allocatable :: list(:)
type(dependency_tree_t) :: deps
table = toml_table()
@@ -169,8 +168,7 @@ contains
type(error_t), allocatable, intent(out) :: error
type(toml_table) :: table
- type(toml_table), pointer :: child, ptr
- type(toml_key), allocatable :: list(:)
+ type(toml_table), pointer :: ptr
type(mock_dependency_tree_t) :: deps
type(dependency_config_t), allocatable :: nodes(:)
@@ -224,10 +222,6 @@ contains
!> Error handling
type(error_t), allocatable, intent(out) :: error
- type(package_config_t) :: package
- character(len=:), allocatable :: manifest, proj_dir, revision
- logical :: fetch
-
if (dependency%done) then
call test_failed(error, "Should only visit this node once")
return
diff --git a/test/fpm_test/test_source_parsing.f90 b/test/fpm_test/test_source_parsing.f90
index 12fc419..047b289 100644
--- a/test/fpm_test/test_source_parsing.f90
+++ b/test/fpm_test/test_source_parsing.f90
@@ -655,7 +655,7 @@ contains
end subroutine test_csource
-
+
!> Try to parse fortran program with invalid use statement
subroutine test_invalid_use_stmt(error)
diff --git a/test/fpm_test/test_versioning.f90 b/test/fpm_test/test_versioning.f90
index f6dcb57..6a77d10 100644
--- a/test/fpm_test/test_versioning.f90
+++ b/test/fpm_test/test_versioning.f90
@@ -272,7 +272,6 @@ contains
type(error_t), allocatable, intent(out) :: error
type(version_t) :: v1, v2
- type(version_t) :: varray(4)
call new_version(v1, [1, 1, 0])
call new_version(v2, [1])
diff --git a/test/help_test/help_test.f90 b/test/help_test/help_test.f90
index 8f0c455..4f23bcb 100644
--- a/test/help_test/help_test.f90
+++ b/test/help_test/help_test.f90
@@ -5,7 +5,7 @@ use,intrinsic :: iso_fortran_env, only : stdin=>input_unit, stdout=>output_unit,
use fpm_filesystem, only : dirname, join_path, exists
use fpm_environment, only : get_os_type, OS_WINDOWS
implicit none
-integer :: i, j
+integer :: i
integer :: be, af
character(len=:),allocatable :: path
integer :: estat, cstat
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-25 01:01:05 +0000