Merge pull request #303 from LKedward/fix-parsing

Fixes to source parsing

Author: awvwgk

fpm/src/fpm_source_parsing.f90

@@ -16,7 +16,7 @@
 !>
 module fpm_source_parsing
 use fpm_error, only: error_t, file_parse_error, fatal_error
-use fpm_strings, only: string_t, split, lower, str_ends_with, fnv_1a
+use fpm_strings, only: string_t, string_cat, split, lower, str_ends_with, fnv_1a
 use fpm_model, only: srcfile_t, &
                     FPM_UNIT_UNKNOWN, FPM_UNIT_PROGRAM, FPM_UNIT_MODULE, &
                     FPM_UNIT_SUBMODULE, FPM_UNIT_SUBPROGRAM, &
@@ -86,6 +86,9 @@ function parse_f_source(f_filename,error) result(f_source)
     file_lines = read_lines(fh)
     close(fh)
 
+    ! Ignore empty files, returned as FPM_UNIT_UNKNOW
+    if (len_trim(string_cat(file_lines,' ')) < 1) return
+
     f_source%digest = fnv_1a(file_lines)
 
     do pass = 1,2
@@ -197,8 +200,14 @@ function parse_f_source(f_filename,error) result(f_source)
 
                 if (mod_name == 'procedure' .or. &
                     mod_name == 'subroutine' .or. &
-                    mod_name == 'function') then
-                    ! Ignore these cases
+                    mod_name == 'function' .or. &
+                    scan(mod_name,'=(')>0 ) then
+                    ! Ignore these cases:
+                    ! module procedure *
+                    ! module function *
+                    ! module subroutine *
+                    ! module =*
+                    ! module (i)
                     cycle
                 end if
 
@@ -275,7 +284,19 @@ function parse_f_source(f_filename,error) result(f_source)
 
             ! Detect if contains a program
             !  (no modules allowed after program def)
-            if (index(adjustl(lower(file_lines(i)%s)),'program') == 1) then
+            if (index(adjustl(lower(file_lines(i)%s)),'program ') == 1) then
+
+                temp_string = lower(split_n(file_lines(i)%s,n=2,delims=' ',stat=stat))
+                if (stat == 0) then
+                    
+                    if (scan(temp_string,'=(')>0 ) then
+                        ! Ignore:
+                        ! program =*
+                        ! program (i) =*
+                        cycle
+                    end if
+
+                end if
 
                 f_source%unit_type = FPM_UNIT_PROGRAM
 
@@ -370,6 +391,12 @@ function parse_c_source(c_filename,error) result(c_source)
     file_lines = read_lines(fh)
     close(fh)
 
+    ! Ignore empty files, returned as FPM_UNIT_UNKNOW
+    if (len_trim(string_cat(file_lines,' ')) < 1) then
+        c_source%unit_type = FPM_UNIT_UNKNOWN
+        return
+    end if
+    
     c_source%digest = fnv_1a(file_lines)
 
     do pass = 1,2

fpm/test/fpm_test/test_source_parsing.f90

@@ -24,6 +24,7 @@ subroutine collect_source_parsing(testsuite)
             & new_unittest("modules-used", test_modules_used), &
             & new_unittest("intrinsic-modules-used", test_intrinsic_modules_used), &
             & new_unittest("include-stmt", test_include_stmt), &
+            & new_unittest("program", test_program), &
             & new_unittest("module", test_module), &
             & new_unittest("program-with-module", test_program_with_module), &
             & new_unittest("submodule", test_submodule), &
@@ -238,6 +239,61 @@ subroutine test_include_stmt(error)
 
     end subroutine test_include_stmt
 
+    !> Try to parse a simple fortran program
+    subroutine test_program(error)
+
+        !> Error handling
+        type(error_t), allocatable, intent(out) :: error
+
+        integer :: unit
+        character(:), allocatable :: temp_file
+        type(srcfile_t), allocatable :: f_source
+
+        allocate(temp_file, source=get_temp_filename())
+
+        open(file=temp_file, newunit=unit)
+        write(unit, '(a)') &
+            & 'program  my_program', &
+            & 'use module_one', &
+            & 'implicit none', &
+            & 'integer :: module', &
+            & 'module = 1', &
+            & 'module= 1', &
+            & 'module =1', &
+            & 'module (i) =1', &
+            & 'contains', &
+            & 'subroutine f()', &
+            & 'end subroutine f', &
+            & 'end program my_program'
+        close(unit)
+
+        f_source = parse_f_source(temp_file,error)
+        if (allocated(error)) then
+            return
+        end if
+
+        if (f_source%unit_type /= FPM_UNIT_PROGRAM) then
+            call test_failed(error,'Wrong unit type detected - expecting FPM_UNIT_PROGRAM')
+            return
+        end if
+
+        if (size(f_source%modules_provided) /= 0) then
+            call test_failed(error,'Unexpected modules_provided - expecting zero')
+            return
+        end if
+
+        if (size(f_source%modules_used) /= 1) then
+            call test_failed(error,'Incorrect number of modules_used - expecting one')
+            return
+        end if
+
+        if (.not.('module_one' .in. f_source%modules_used)) then
+            call test_failed(error,'Missing module in modules_used')
+            return
+        end if
+
+    end subroutine test_program
+
 
     !> Try to parse fortran module
     subroutine test_module(error)
@@ -258,6 +314,11 @@ subroutine test_module(error)
             & 'interface', &
             & '  module subroutine f()', &
             & 'end interface', &
+            & 'integer :: program', &
+            & 'program = 1', &
+            & 'program= 1', &
+            & 'program =1', &
+            & 'program (i) =1', &
             & 'contains', &
             & 'module procedure f()', &
             & 'end procedure f', &