Skip to content

Commit c5c7e1a

Browse files
committed
Merge branch 'tree-shaking' of github.com:LKedward/fpm into tree-shaking
2 parents 142d259 + cdc7908 commit c5c7e1a

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

src/fpm_backend_console.f90

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ subroutine console_update_line(console,line_no,str)
101101
! Step back to line
102102
write(stdout,'(A)',advance="no") repeat(LINE_UP,n)//LINE_RESET
103103

104-
write(stdout,'(A)') str
104+
write(stdout,'(A)',advance="no") str
105105

106106
! Step forward to end
107107
write(stdout,'(A)',advance="no") repeat(LINE_DOWN,n)//LINE_RESET

src/fpm_source_parsing.f90

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@
1515
!> - `[[parse_c_source]]`
1616
!>
1717
module fpm_source_parsing
18-
use fpm_error, only: error_t, file_parse_error, fatal_error
18+
use fpm_error, only: error_t, file_parse_error, fatal_error, file_not_found_error
1919
use fpm_strings, only: string_t, string_cat, len_trim, split, lower, str_ends_with, fnv_1a, is_fortran_name
2020
use fpm_model, only: srcfile_t, &
2121
FPM_UNIT_UNKNOWN, FPM_UNIT_PROGRAM, FPM_UNIT_MODULE, &
2222
FPM_UNIT_SUBMODULE, FPM_UNIT_SUBPROGRAM, &
2323
FPM_UNIT_CSOURCE, FPM_UNIT_CHEADER, FPM_SCOPE_UNKNOWN, &
2424
FPM_SCOPE_LIB, FPM_SCOPE_DEP, FPM_SCOPE_APP, FPM_SCOPE_TEST
25-
use fpm_filesystem, only: read_lines, read_lines_expanded
25+
use fpm_filesystem, only: read_lines, read_lines_expanded, exists
2626
implicit none
2727

2828
private
@@ -82,6 +82,11 @@ function parse_f_source(f_filename,error) result(f_source)
8282
type(string_t), allocatable :: file_lines(:), file_lines_lower(:)
8383
character(:), allocatable :: temp_string, mod_name, string_parts(:)
8484

85+
if (.not. exists(f_filename)) then
86+
call file_not_found_error(error, f_filename)
87+
return
88+
end if
89+
8590
f_source%file_name = f_filename
8691

8792
open(newunit=fh,file=f_filename,status='old')

0 commit comments

Comments
 (0)