From 4af73a868c7d35641f8a1bcd0a82f8c7db411d8d Mon Sep 17 00:00:00 2001 From: Dirkjan Ochtman Date: Fri, 20 Oct 2017 10:09:50 +0200 Subject: Add support for array literals (fixes #59) --- askama_shared/src/parser.rs | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'askama_shared/src/parser.rs') diff --git a/askama_shared/src/parser.rs b/askama_shared/src/parser.rs index 7cd8936..accefd2 100644 --- a/askama_shared/src/parser.rs +++ b/askama_shared/src/parser.rs @@ -7,6 +7,7 @@ pub enum Expr<'a> { StrLit(&'a str), Var(&'a str), Path(Vec<&'a str>), + Array(Vec>), Attr(Box>, &'a str), Filter(&'a str, Vec>), BinOp(&'a str, Box>, Box>), @@ -128,6 +129,22 @@ named!(expr_num_lit, map!(num_lit, |s| Expr::NumLit(s) )); +named!(expr_array_lit, do_parse!( + ws!(tag_s!("[")) >> + first: expr_any >> + rest: many0!(do_parse!( + ws!(tag_s!(",")) >> + part: expr_any >> + (part) + )) >> + ws!(tag_s!("]")) >> + ({ + let mut elements = vec![first]; + elements.extend(rest); + Expr::Array(elements) + }) +)); + named!(expr_str_lit, map!( delimited!(char!('"'), is_not!("\""), char!('"')), |s| Expr::StrLit(str::from_utf8(s).unwrap()) @@ -204,6 +221,7 @@ named!(expr_single, alt!( expr_num_lit | expr_str_lit | expr_path | + expr_array_lit | expr_var | expr_group )); -- cgit