refactor: removed parse_cpp_source subroutine and test for it

Author: arteevraina

src/fpm_source_parsing.f90

@@ -27,7 +27,7 @@ module fpm_source_parsing
 implicit none
 
 private
-public :: parse_f_source, parse_c_source, parse_cpp_source
+public :: parse_f_source, parse_c_source
 
 character(15), parameter :: INTRINSIC_MODULE_NAMES(*) =  &
                              ['iso_c_binding  ', &
@@ -436,7 +436,7 @@ function parse_f_source(f_filename,error) result(f_source)
 end function parse_f_source
 
 
-!> Parsing of c source files
+!> Parsing of c, cpp source files
 !>
 !> The following statements are recognised and parsed:
 !>
@@ -456,10 +456,14 @@ function parse_c_source(c_filename,error) result(c_source)
 
         c_source%unit_type = FPM_UNIT_CSOURCE
 
-    elseif (str_ends_with(lower(c_filename), ".h")) then
+    else if (str_ends_with(lower(c_filename), ".h")) then
 
         c_source%unit_type = FPM_UNIT_CHEADER
 
+    else if (str_ends_with(lower(c_filename), ".cpp")) then 
+
+        c_source%unit_type = FPM_UNIT_CPPSOURCE
+
     end if
 
     allocate(c_source%modules_used(0))
@@ -513,80 +517,6 @@ function parse_c_source(c_filename,error) result(c_source)
 
 end function parse_c_source
 
-!> Parsing of cpp source files
-!>
-!> The following statements are recognised and parsed:
-!>
-!> - `#include` preprocessor statement
-!>
-function parse_cpp_source(c_filename,error) result(cpp_source)
-    character(*), intent(in) :: c_filename
-    type(srcfile_t) :: cpp_source
-    type(error_t), allocatable, intent(out) :: error
-
-    integer :: fh, n_include, i, pass, stat
-    type(string_t), allocatable :: file_lines(:)
-
-    cpp_source%file_name = c_filename
-
-    if (str_ends_with(lower(c_filename), ".cpp")) then
-
-        cpp_source%unit_type = FPM_UNIT_CPPSOURCE
-
-    end if
-
-    allocate(cpp_source%modules_used(0))
-    allocate(cpp_source%modules_provided(0))
-    allocate(cpp_source%parent_modules(0))
-
-    open(newunit=fh,file=c_filename,status='old')
-    file_lines = read_lines(fh)
-    close(fh)
-
-    ! Ignore empty files, returned as FPM_UNIT_UNKNOWN
-    if (len_trim(file_lines) < 1) then
-        cpp_source%unit_type = FPM_UNIT_UNKNOWN
-        return
-    end if
-
-    cpp_source%digest = fnv_1a(file_lines)
-
-    do pass = 1,2
-        n_include = 0
-        file_loop: do i=1,size(file_lines)
-
-            ! Process 'INCLUDE' statements
-            if (index(adjustl(lower(file_lines(i)%s)),'#include') == 1 .and. &
-                index(file_lines(i)%s,'"') > 0) then
-
-                n_include = n_include + 1
-
-                if (pass == 2) then
-
-                    cpp_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,c_filename, &
-                            'unable to get cpp include file',i, &
-                            file_lines(i)%s,index(file_lines(i)%s,'"'))
-                        return
-                    end if
-
-                end if
-
-            end if
-
-        end do file_loop
-
-        if (pass == 1) then
-            allocate(cpp_source%include_dependencies(n_include))
-        end if
-
-    end do
-
-end function parse_cpp_source
-
-
 !> Split a string on one or more delimeters
 !>  and return the nth substring if it exists
 !>

src/fpm_sources.f90

@@ -8,7 +8,7 @@ module fpm_sources
 use fpm_model, only: srcfile_t, FPM_UNIT_PROGRAM
 use fpm_filesystem, only: basename, canon_path, dirname, join_path, list_files, is_hidden_file
 use fpm_strings, only: lower, str_ends_with, string_t, operator(.in.)
-use fpm_source_parsing, only: parse_f_source, parse_c_source, parse_cpp_source
+use fpm_source_parsing, only: parse_f_source, parse_c_source
 use fpm_manifest_executable, only: executable_config_t
 implicit none
 
@@ -17,6 +17,7 @@ module fpm_sources
 
 character(4), parameter :: fortran_suffixes(2) = [".f90", &
                                                   ".f  "]
+character(4), parameter :: c_suffixes(3) = [".c  ", ".h  ", ".cpp"]
 
 contains
 
@@ -35,14 +36,10 @@ function parse_source(source_file_path,error) result(source)
             source%exe_name = basename(source_file_path,suffix=.false.)
         end if
 
-    else if (str_ends_with(lower(source_file_path), [".c", ".h"])) then
+    else if (str_ends_with(lower(source_file_path), c_suffixes)) then
 
         source = parse_c_source(source_file_path,error)
 
-    else if (str_ends_with(lower(source_file_path), [".cpp"])) then 
-
-        source = parse_cpp_source(source_file_path, error)
-
     end if
 
     if (allocated(error)) then

test/fpm_test/test_source_parsing.f90

@@ -2,7 +2,7 @@
 module test_source_parsing
     use testsuite, only : new_unittest, unittest_t, error_t, test_failed
     use fpm_filesystem, only: get_temp_filename
-    use fpm_source_parsing, only: parse_f_source, parse_c_source, parse_cpp_source
+    use fpm_source_parsing, only: parse_f_source, parse_c_source
     use fpm_model, only: srcfile_t, FPM_UNIT_PROGRAM, FPM_UNIT_MODULE, &
                          FPM_UNIT_SUBMODULE, FPM_UNIT_SUBPROGRAM, FPM_UNIT_CSOURCE, &
                          FPM_UNIT_CPPSOURCE
@@ -42,8 +42,7 @@ subroutine collect_source_parsing(testsuite)
             & new_unittest("invalid-module", &
                            test_invalid_module, should_fail=.true.), &
             & new_unittest("invalid-submodule", &
-                           test_invalid_submodule, should_fail=.true.), &
-            & new_unittest("cppsource", test_cppsource) &
+                           test_invalid_submodule, should_fail=.true.) &
             ]
 
     end subroutine collect_source_parsing
@@ -838,82 +837,6 @@ subroutine test_csource(error)
 
     end subroutine test_csource
 
-    !> Try to parse standard cpp source for includes
-    subroutine test_cppsource(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())
-        temp_file = temp_file//'.cpp'
-
-        open(file=temp_file, newunit=unit)
-        write(unit, '(a)') &
-            & '#include "file1.h"', &
-            & '#include "file2.h"', &
-            & 'void sum(int a) {', &
-            & ' #include "function_body.cpp"', &
-            & ' // This is the function body.', &
-            & ' return', &
-            & '}'
-        close(unit)
-
-        f_source = parse_cpp_source(temp_file,error)
-        if (allocated(error)) then
-            return
-        end if
-
-        if (f_source%unit_type /= FPM_UNIT_CPPSOURCE) then
-            call test_failed(error,'Wrong unit type detected - expecting FPM_UNIT_CSOURCE')
-            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) /= 0) then
-            call test_failed(error,'Incorrect number of modules_used - expecting zero')
-            return
-        end if
-
-        if (size(f_source%include_dependencies) /= 3) then
-            call test_failed(error,'Incorrect number of include_dependencies - expecting two')
-            return
-        end if
-
-        if (allocated(f_source%link_libraries)) then
-            call test_failed(error,'Unexpected link_libraries - expecting unallocated')
-            return
-        end if
-        
-        if (size(f_source%parent_modules) /= 0) then
-            call test_failed(error,'Incorrect number of parent_modules - expecting zero')
-            return
-        end if
-
-        if (.not.('file1.h' .in. f_source%include_dependencies)) then
-            call test_failed(error,'Missing file in include_dependencies')
-            return
-        end if
-
-        if (.not.('file2.h' .in. f_source%include_dependencies)) then
-            call test_failed(error,'Missing file in include_dependencies')
-            return
-        end if
-
-        if (.not.('function_body.cpp' .in. f_source%include_dependencies)) then
-            call test_failed(error,'Missing file in include_dependencies')
-            return
-        end if
-
-    end subroutine test_cppsource
-
     !> Try to parse fortran program with invalid use statement
     subroutine test_invalid_use_stmt(error)