diff options
author | René Kijewski <kijewski@library.vetmed.fu-berlin.de> | 2021-06-29 15:15:18 +0200 |
---|---|---|
committer | Dirkjan Ochtman <dirkjan@ochtman.nl> | 2021-07-01 10:24:32 +0200 |
commit | 06d2eee4a0cd9070444d9d166044de9ffe6ca330 (patch) | |
tree | 3b5976ea68f4b94517e4d2070a280df111c2cc83 /askama_shared/src/parser.rs | |
parent | 5afabbc7e3ae7146d14c95735850edfd7f705421 (diff) | |
download | askama-06d2eee4a0cd9070444d9d166044de9ffe6ca330.tar.gz askama-06d2eee4a0cd9070444d9d166044de9ffe6ca330.tar.bz2 askama-06d2eee4a0cd9070444d9d166044de9ffe6ca330.zip |
Implement "if let" statement
Diffstat (limited to 'askama_shared/src/parser.rs')
-rw-r--r-- | askama_shared/src/parser.rs | 32 |
1 files changed, 27 insertions, 5 deletions
diff --git a/askama_shared/src/parser.rs b/askama_shared/src/parser.rs index ea13738..3c5a86c 100644 --- a/askama_shared/src/parser.rs +++ b/askama_shared/src/parser.rs @@ -18,7 +18,7 @@ pub enum Node<'a> { Call(Ws, Option<&'a str>, &'a str, Vec<Expr<'a>>), LetDecl(Ws, Target<'a>), Let(Ws, Target<'a>, Expr<'a>), - Cond(Vec<(Ws, Option<Expr<'a>>, Vec<Node<'a>>)>, Ws), + Cond(Vec<Cond<'a>>, Ws), Match(Ws, Expr<'a>, Vec<When<'a>>, Ws), Loop(Ws, Target<'a>, Expr<'a>, Vec<Node<'a>>, Ws), Extends(Expr<'a>), @@ -144,7 +144,13 @@ pub enum Target<'a> { #[derive(Clone, Copy, Debug, PartialEq)] pub struct Ws(pub bool, pub bool); -pub type Cond<'a> = (Ws, Option<Expr<'a>>, Vec<Node<'a>>); +pub type Cond<'a> = (Ws, Option<CondTest<'a>>, Vec<Node<'a>>); + +#[derive(Debug, PartialEq)] +pub struct CondTest<'a> { + pub target: Option<(MatchVariant<'a>, Option<MatchParameters<'a>>)>, + pub expr: Expr<'a>, +} fn ws<F, I, O, E>(mut inner: F) -> impl FnMut(I) -> IResult<I, O, E> where @@ -724,9 +730,25 @@ fn block_call(i: &[u8]) -> IResult<&[u8], Node> { )) } -fn cond_if(i: &[u8]) -> IResult<&[u8], Expr> { - let (i, (_, cond)) = tuple((ws(tag("if")), ws(expr_any)))(i)?; - Ok((i, cond)) +fn cond_if(i: &[u8]) -> IResult<&[u8], CondTest> { + let mut p = tuple(( + ws(tag("if")), + opt(tuple(( + ws(alt((tag("let"), tag("set")))), + ws(match_variant), + opt(alt((match_simple_parameters, match_named_parameters))), + ws(tag("=")), + ))), + ws(expr_any), + )); + let (i, (_, dest, expr)) = p(i)?; + Ok(( + i, + CondTest { + target: dest.map(|(_, variant, params, _)| (variant, params)), + expr, + }, + )) } fn cond_block<'a>(i: &'a [u8], s: &'a Syntax<'a>) -> IResult<&'a [u8], Cond<'a>> { |