rtyler
/
zap
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Clean up missing copy/pasta between task and plan parsing

This commit is contained in:
R Tyler Croy 2020-12-31 14:26:11 -08:00
parent d765cc5703
commit d5b8cb6dfc
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
examples/basic.zplan
View File

@ -4,10 +4,16 @@
* It is expected to be run from the root of the project tree.
*/
task "tasks/echo.ztask" {
msg = "Hello from the wonderful world of zplans!"
task 'tasks/echo.ztask' {
msg = 'Hello from the wonderful world of zplans!'
}
task "tasks/echo.ztask" {
msg = "This is nice"
task 'tasks/echo.ztask' {
msg = 'This is nice'
}
task 'tasks/shell/bash.ztask' {
script = '''
ls -lah
'''
}

6
parser/src/plan.rs
View File

@ -138,12 +138,18 @@ fn parse_str(parser: &mut Pairs<Rule>) -> Result<String, PestError<Rule>> {
Rule::string => {
return parse_str(&mut parsed.into_inner());
}
Rule::triple_quoted => {
return parse_str(&mut parsed.into_inner());
}
Rule::single_quoted => {
return parse_str(&mut parsed.into_inner());
}
Rule::inner_single_str => {
return Ok(parsed.as_str().to_string());
}
Rule::inner_triple_str => {
return Ok(parsed.as_str().to_string());
}
_ => {}
}
}