Merge pull request #704 from LKedward/fix-submodule-shaking

Fix submodule shaking

Author: LKedward

ci/run_tests.sh

@@ -76,8 +76,6 @@ test ! -e ./build/gfortran_*/submodule_tree_shake/src_parent_unused.f90.o
 test ! -e ./build/gfortran_*/submodule_tree_shake/src_parent_unused.f90.o.log
 test ! -e ./build/gfortran_*/submodule_tree_shake/src_child_unused.f90.o
 test ! -e ./build/gfortran_*/submodule_tree_shake/src_child_unused.f90.o.log
-test ! -e ./build/gfortran_*/submodule_tree_shake/src_grandchild.f90.o
-test ! -e ./build/gfortran_*/submodule_tree_shake/src_grandchild.f90.o.log
 popd
 
 pushd version_file

example_packages/submodule_tree_shake/src/child1.f90

@@ -10,7 +10,7 @@ end function my_fun
 contains
 
 module procedure my_sub1
-    a = 1
+    a = my_fun()
 end procedure my_sub1
 
 end submodule child1

src/fpm_source_parsing.f90

@@ -614,6 +614,7 @@ function parse_sequence(string,t1,t2,t3,t4) result(found)
         select case(token_n)
         case(1)
             incr = len(t1)
+            if (pos+incr-1>n) return
             match = string(pos:pos+incr-1) == t1
         case(2)
             if (.not.present(t2)) exit

src/fpm_targets.f90

@@ -615,25 +615,27 @@ recursive subroutine collect_used_modules(target)
         end if
 
         if (allocated(target%source)) then
-            do j=1,size(target%source%modules_used)
-                        
-                if (.not.(target%source%modules_used(j)%s .in. modules_used)) then
-
-                    modules_used = [modules_used, target%source%modules_used(j)]
-
-                    ! Recurse into child submodules
-                    do k=1,size(targets)
-                        if (allocated(targets(k)%ptr%source)) then
-                            if (targets(k)%ptr%source%unit_type == FPM_UNIT_SUBMODULE) then
-                                if (target%source%modules_used(j)%s .in. targets(k)%ptr%source%parent_modules) then
-                                    call collect_used_modules(targets(k)%ptr)
-                                end if
-                            end if
-                        end if
-                    end do
+
+            ! Add modules from this target and from any of it's children submodules
+            do j=1,size(target%source%modules_provided)
+
+                if (.not.(target%source%modules_provided(j)%s .in. modules_used)) then
+
+                    modules_used = [modules_used, target%source%modules_provided(j)]
 
                 end if
 
+                ! Recurse into child submodules
+                do k=1,size(targets)
+                    if (allocated(targets(k)%ptr%source)) then
+                        if (targets(k)%ptr%source%unit_type == FPM_UNIT_SUBMODULE) then
+                            if (target%source%modules_provided(j)%s .in. targets(k)%ptr%source%parent_modules) then
+                                call collect_used_modules(targets(k)%ptr)
+                            end if
+                        end if
+                    end if
+                end do
+
             end do
         end if