Skip to content

Commit 9bd9d3f

Browse files
committed
Fix: more trimming of split string output.
1 parent 35ae709 commit 9bd9d3f

File tree

1 file changed

+4
-6
lines changed

1 file changed

+4
-6
lines changed

fpm/src/fpm_sources.f90

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ function parse_f_source(f_filename) result(f_source)
236236
if (index(file_lines(i)%s,'::') > 0) then
237237

238238
call split(file_lines(i)%s,line_parts,delimiters=':')
239-
temp_string = line_parts(2)
239+
temp_string = trim(line_parts(2))
240240
call split(temp_string,line_parts,delimiters=' ,')
241241
mod_name = trim(lower(line_parts(1)))
242242

@@ -273,7 +273,7 @@ function parse_f_source(f_filename) result(f_source)
273273

274274
if (pass == 2) then
275275
call split(file_lines(i)%s,line_parts,delimiters="'"//'"')
276-
f_source%include_dependencies(n_include)%s = line_parts(2)
276+
f_source%include_dependencies(n_include)%s = trim(line_parts(2))
277277
end if
278278

279279
end if
@@ -322,12 +322,10 @@ function parse_f_source(f_filename) result(f_source)
322322

323323
end if
324324

325-
! Extract name of program if is program
325+
! Detect if is program
326326
if (f_source%unit_type == FPM_UNIT_UNKNOWN .and. &
327327
index(adjustl(lower(file_lines(i)%s)),'program') == 1) then
328328

329-
call split(file_lines(i)%s,line_parts,delimiters=' ')
330-
331329
f_source%unit_type = FPM_UNIT_PROGRAM
332330

333331
end if
@@ -433,7 +431,7 @@ function parse_c_source(c_filename) result(c_source)
433431

434432
if (pass == 2) then
435433
call split(file_lines(i)%s,line_parts,delimiters='"')
436-
c_source%include_dependencies(n_include)%s = line_parts(2)
434+
c_source%include_dependencies(n_include)%s = trim(line_parts(2))
437435
end if
438436

439437
end if

0 commit comments

Comments
 (0)