NGnius/muss
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity

Fix crash on empty files() statement

Browse source
This commit is contained in:
NGnius (Graham) 2022-01-06 19:53:10 -05:00
parent 5fe58cda10
commit 73aae27148
1 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
mps-interpreter/src/lang/vocabulary/files.rs
View file

@ -125,21 +125,21 @@ impl MpsFunctionFactory<FilesStatement> for FilesFunctionFactory {
let mut root_path = None; let mut root_path = None;
let mut pattern = None; let mut pattern = None;
let mut recursive = None; let mut recursive = None;
if tokens[0].is_literal() {
// folder is specified without keyword
root_path = Some(assert_token(
|t| match t {
MpsToken::Literal(s) => Some(s),
_ => None,
},
MpsToken::Literal("/path/to/music/folder".into()),
tokens,
)?);
if tokens.len() > 1 && tokens[0].is_comma() {
assert_token_raw(MpsToken::Comma, tokens)?;
}
}
if tokens.len() != 0 { if tokens.len() != 0 {
if tokens[0].is_literal() {
// folder is specified without keyword
root_path = Some(assert_token(
|t| match t {
MpsToken::Literal(s) => Some(s),
_ => None,
},
MpsToken::Literal("/path/to/music/folder".into()),
tokens,
)?);
if tokens.len() > 1 && tokens[0].is_comma() {
assert_token_raw(MpsToken::Comma, tokens)?;
}
}
// parse keyword function parameters // parse keyword function parameters
let ingest = |tokens2: &mut VecDeque<MpsToken>| { let ingest = |tokens2: &mut VecDeque<MpsToken>| {
if tokens2.len() < 3 { if tokens2.len() < 3 {