Skip to content

Commit 6073158

Browse files
committed
Fix tokenization with new shlex version
1 parent 8471ded commit 6073158

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

fpm.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ fortran-regex.git = "https://github.com/perazz/fortran-regex"
2020
fortran-regex.tag = "1.1.2"
2121
jonquil.git = "https://github.com/toml-f/jonquil"
2222
jonquil.rev = "4fbd4cf34d577c0fd25e32667ee9e41bf231ece8"
23-
fortran-shlex.git = "https://github.com/perazz/fortran-shlex"
24-
fortran-shlex.tag = "1.0.1"
23+
fortran-shlex.git = "https://github.com/itpplasma/fortran-shlex" # TODO: Change back to perazz
24+
fortran-shlex.tag = "main" # TODO: Change back to 1.2.x
2525

2626
[[test]]
2727
name = "cli-test"

src/fpm_compiler.F90

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1548,8 +1548,13 @@ subroutine tokenize_flags(flags, flags_array)
15481548
character(len=:), allocatable :: flags_char_array(:)
15491549

15501550
integer :: i
1551+
logical :: success
15511552

1552-
flags_char_array = shlex_split(flags)
1553+
flags_char_array = shlex_split(flags, join_spaced=.true., keep_quotes=.true., success=success)
1554+
if (.not. success) then
1555+
allocate(flags_array(0))
1556+
return
1557+
end if
15531558
allocate(flags_array(size(flags_char_array)))
15541559
do i = 1, size(flags_char_array)
15551560
flags_array(i)%s = trim(adjustl(flags_char_array(i)))

0 commit comments

Comments
 (0)