Merge branch 'fix-duplicate-discovery' into local-depends

Author: LKedward

fpm/src/fpm_sources.f90

@@ -6,7 +6,7 @@ module fpm_sources
                     FPM_UNIT_CSOURCE, FPM_UNIT_CHEADER, FPM_SCOPE_UNKNOWN, &
                     FPM_SCOPE_LIB, FPM_SCOPE_DEP, FPM_SCOPE_APP, FPM_SCOPE_TEST
 
-use fpm_filesystem, only: basename, canon_path, dirname, read_lines, list_files
+use fpm_filesystem, only: basename, canon_path, dirname, join_path, read_lines, list_files
 use fpm_strings, only: lower, split, str_ends_with, string_t, operator(.in.)
 use fpm_manifest_executable, only: executable_t
 implicit none
@@ -24,6 +24,33 @@ module fpm_sources
 
 contains
 
+function parse_source(source_file_path,error) result(source)
+    character(*), intent(in) :: source_file_path
+    type(error_t), allocatable, intent(out) :: error
+    type(srcfile_t)  :: source
+
+    if (str_ends_with(lower(source_file_path), ".f90")) then
+
+        source = parse_f_source(source_file_path, error)
+
+        if (source%unit_type == FPM_UNIT_PROGRAM) then
+            source%exe_name = basename(source_file_path,suffix=.false.)
+        end if
+
+    else if (str_ends_with(lower(source_file_path), ".c") .or. &
+        str_ends_with(lower(source_file_path), ".h")) then
+
+        source = parse_c_source(source_file_path,error)
+
+    end if
+
+    if (allocated(error)) then
+        return
+    end if
+
+end function parse_source
+
+
 subroutine add_sources_from_dir(sources,directory,scope,with_executables,error)
     ! Enumerate sources in a directory
     !
@@ -33,7 +60,7 @@ subroutine add_sources_from_dir(sources,directory,scope,with_executables,error)
     logical, intent(in), optional :: with_executables
     type(error_t), allocatable, intent(out) :: error
 
-    integer :: i, j
+    integer :: i
     logical, allocatable :: is_source(:), exclude_source(:)
     type(string_t), allocatable :: file_names(:)
     type(string_t), allocatable :: src_file_names(:)
@@ -63,26 +90,8 @@ subroutine add_sources_from_dir(sources,directory,scope,with_executables,error)
 
     do i = 1, size(src_file_names)
 
-        if (str_ends_with(lower(src_file_names(i)%s), ".f90")) then
-
-            dir_sources(i) = parse_f_source(src_file_names(i)%s, error)
-
-            if (allocated(error)) then
-                return
-            end if
-
-        end if
-
-        if (str_ends_with(lower(src_file_names(i)%s), ".c") .or. &
-            str_ends_with(lower(src_file_names(i)%s), ".h")) then
-
-            dir_sources(i) = parse_c_source(src_file_names(i)%s,error)
-
-            if (allocated(error)) then
-                return
-            end if
-
-        end if
+        dir_sources(i) = parse_source(src_file_names(i)%s,error)
+        if (allocated(error)) return
 
         dir_sources(i)%unit_scope = scope
 
@@ -93,7 +102,6 @@ subroutine add_sources_from_dir(sources,directory,scope,with_executables,error)
             if (with_executables) then
 
                 exclude_source(i) = .false.
-                dir_sources(i)%exe_name = basename(src_file_names(i)%s,suffix=.false.)
 
             end if
         end if
@@ -122,49 +130,50 @@ subroutine add_executable_sources(sources,executables,scope,auto_discover,error)
     integer :: i, j
 
     type(string_t), allocatable :: exe_dirs(:)
-    logical, allocatable :: include_source(:)
-    type(srcfile_t), allocatable :: dir_sources(:)
+    type(srcfile_t) :: exe_source
 
     call get_executable_source_dirs(exe_dirs,executables)
 
     do i=1,size(exe_dirs)
-        call add_sources_from_dir(dir_sources,exe_dirs(i)%s, &
-                     scope, with_executables=.true.,error=error)
+        call add_sources_from_dir(sources,exe_dirs(i)%s, &
+                     scope, with_executables=auto_discover,error=error)
 
         if (allocated(error)) then
             return
         end if
     end do
 
-    allocate(include_source(size(dir_sources)))
+    exe_loop: do i=1,size(executables)
 
-    do i = 1, size(dir_sources)
-        
-        ! Include source by default if not a program or if auto_discover is enabled
-        include_source(i) = (dir_sources(i)%unit_type /= FPM_UNIT_PROGRAM) .or. &
-                             auto_discover
+        ! Check if executable already discovered automatically
+        !  and apply any overrides
+        do j=1,size(sources)
 
-        ! Always include sources specified in fpm.toml
-        do j=1,size(executables)
-
-            if (basename(dir_sources(i)%file_name,suffix=.true.) == executables(j)%main .and.&
-                 canon_path(dirname(dir_sources(i)%file_name)) == &
-                 canon_path(executables(j)%source_dir) ) then
+            if (basename(sources(j)%file_name,suffix=.true.) == executables(i)%main .and.&
+                 canon_path(dirname(sources(j)%file_name)) == &
+                 canon_path(executables(i)%source_dir) ) then
 
-                include_source(i) = .true.
-                dir_sources(i)%exe_name = executables(j)%name
-                exit
+                sources(j)%exe_name = executables(i)%name
+                cycle exe_loop
 
             end if
+
         end do
 
-    end do
+        ! Add if not already discovered (auto_discovery off)
+        exe_source = parse_source(join_path(executables(i)%source_dir,executables(i)%main),error)
+        exe_source%exe_name = executables(i)%name
+        exe_source%unit_scope = scope
+        
+        if (allocated(error)) return
 
-    if (.not.allocated(sources)) then
-        sources = pack(dir_sources,include_source)
-    else
-        sources = [sources, pack(dir_sources,include_source)]
-    end if
+        if (.not.allocated(sources)) then
+            sources = [exe_source]
+        else
+            sources = [sources, exe_source]
+        end if
+
+    end do exe_loop
 
 end subroutine add_executable_sources
 
@@ -291,21 +300,26 @@ function parse_f_source(f_filename,error) result(f_source)
             end if
 
             ! Process 'INCLUDE' statements
-            if (index(adjustl(lower(file_lines(i)%s)),'include') == 1) then
-    
-                n_include = n_include + 1
+            ic = index(adjustl(lower(file_lines(i)%s)),'include')
+            if ( ic == 1 ) then
+                ic = index(lower(file_lines(i)%s),'include')
+                if (index(adjustl(file_lines(i)%s(ic+7:)),'"') == 1 .or. &
+                    index(adjustl(file_lines(i)%s(ic+7:)),"'") == 1 ) then
 
-                if (pass == 2) then
-                    f_source%include_dependencies(n_include)%s = &
-                     & split_n(file_lines(i)%s,n=2,delims="'"//'"',stat=stat)
-                    if (stat /= 0) then
-                        call file_parse_error(error,f_filename, &
-                              'unable to find include file name',i, &
-                              file_lines(i)%s)
-                        return
+    
+                    n_include = n_include + 1
+
+                    if (pass == 2) then
+                        f_source%include_dependencies(n_include)%s = &
+                         & split_n(file_lines(i)%s,n=2,delims="'"//'"',stat=stat)
+                        if (stat /= 0) then
+                            call file_parse_error(error,f_filename, &
+                                  'unable to find include file name',i, &
+                                  file_lines(i)%s)
+                            return
+                        end if
                     end if
                 end if
-
             end if
 
             ! Extract name of module if is module

fpm/test/fpm_test/test_source_parsing.f90

@@ -198,9 +198,11 @@ subroutine test_include_stmt(error)
         write(unit, '(a)') &
             & 'program test', &
             & ' implicit none', &
-            & ' include "included_file.f90"', &
+            & ' include  "included_file.f90"', &
+            & ' character(*) :: include_comments', &
+            & ' include_comments = "some comments"', &
             & ' contains ', &
-            & '  include "second_include.f90"', &
+            & '  include"second_include.f90"', &
             & 'end program test'
         close(unit)
 

test/example_packages/hello_complex_2/app/say_hello/app_hello_mod.f90

@@ -1,4 +1,6 @@
 module app_hello_mod
 implicit none
 
+integer :: hello_int = 42
+
 end module app_hello_mod