Minor parser improvement.

kaj · Mar 11, 2018 · 29dac3d · 29dac3d
1 parent 6d0fadd
commit 29dac3d
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/src/templateexpression.rs b/src/templateexpression.rs
@@ -174,7 +174,8 @@ named!(
                            alt!(tag!(":") | tag!("{") | tag!("}") |
                                 terminated!(
                                     alt!(tag!("if") | tag!("for")),
-                                    tag!(" "))))),
+                                    tag!(" ")) |
+                                value!(&b""[..])))),
             Some(b":") => map!(
                 pair!(rust_name,
                       delimited!(tag!("("),
@@ -239,14 +240,16 @@ named!(
                     expr: expr,
                     body: body,
                 }) |
+            Some(b"") => map!(
+                expression,
+                |expr| TemplateExpression::Expression{ expr: expr }
+            ) |
             None => alt!(
                 map!(comment, |()| TemplateExpression::Comment) |
                 map!(is_not!("@{}"),
                      |text| TemplateExpression::Text {
                          text: from_utf8(text).unwrap().to_string()
-                     }) |
-                map!(preceded!(tag!("@"), expression),
-                     |expr| TemplateExpression::Expression{ expr: expr })
+                     })
             )
     ))
 );