From e46e2d6b02394eea8ffe7ac723469b9b114e234c Mon Sep 17 00:00:00 2001
From: Dirkjan Ochtman <dirkjan@ochtman.nl>
Date: Thu, 12 Apr 2018 19:49:16 +0200
Subject: Handle a lack of whitespace after match block (fixes #76)

---
 askama_shared/src/generator.rs | 10 ++++++----
 askama_shared/src/parser.rs    |  9 +++++----
 2 files changed, 11 insertions(+), 8 deletions(-)

(limited to 'askama_shared')

diff --git a/askama_shared/src/generator.rs b/askama_shared/src/generator.rs
index bec3437..8a112c8 100644
--- a/askama_shared/src/generator.rs
+++ b/askama_shared/src/generator.rs
@@ -415,11 +415,13 @@ impl<'a> Generator<'a> {
         self.writeln("}");
     }
 
-    fn write_match(&mut self, state: &'a State, ws1: &WS, expr: &Expr, inter: &'a str, arms:
-                   &'a [When], ws2: &WS) {
+    fn write_match(&mut self, state: &'a State, ws1: &WS, expr: &Expr, inter: Option<&'a str>,
+                   arms: &'a [When], ws2: &WS) {
         self.flush_ws(ws1);
-        if !inter.is_empty() {
-            self.next_ws = Some(inter);
+        if let Some(inter) = inter {
+            if !inter.is_empty() {
+                self.next_ws = Some(inter);
+            }
         }
 
         self.write("match ");
diff --git a/askama_shared/src/parser.rs b/askama_shared/src/parser.rs
index 14d1fe8..402801f 100644
--- a/askama_shared/src/parser.rs
+++ b/askama_shared/src/parser.rs
@@ -58,7 +58,7 @@ pub enum Node<'a> {
     LetDecl(WS, Target<'a>),
     Let(WS, Target<'a>, Expr<'a>),
     Cond(Vec<(WS, Option<Expr<'a>>, Vec<Node<'a>>)>, WS),
-    Match(WS, Expr<'a>, &'a str, Vec<When<'a>>, WS),
+    Match(WS, Expr<'a>, Option<&'a str>, Vec<When<'a>>, WS),
     Loop(WS, Target<'a>, Expr<'a>, Vec<Node<'a>>, WS),
     Extends(Expr<'a>),
     BlockDef(WS, &'a str, Vec<Node<'a>>, WS),
@@ -480,7 +480,7 @@ named!(block_match<Node>, do_parse!(
     expr: ws!(expr_any) >>
     nws1: opt!(tag_s!("-")) >>
     tag_s!("%}") >>
-    inter: take_content >>
+    inter: opt!(take_content) >>
     arms: many1!(when_block) >>
     else_arm: opt!(match_else_block) >>
     ws!(tag_s!("{%")) >>
@@ -493,13 +493,14 @@ named!(block_match<Node>, do_parse!(
             arms.push(arm);
         }
         let inter = match inter {
-            Node::Lit(lws, val, rws) => {
+            Some(Node::Lit(lws, val, rws)) => {
                 assert!(val.is_empty(),
                         "only whitespace allowed between match and first when, found {}", val);
                 assert!(rws.is_empty(),
                         "only whitespace allowed between match and first when, found {}", rws);
-                lws
+                Some(lws)
             },
+            None => None,
             _ => panic!("only literals allowed between match and first when"),
         };
         Node::Match(
-- 
cgit