Adds validator field to Output

tailhook · Sep 7, 2017 · d3fd1bd · d3fd1bd
1 parent 6b1b994
commit d3fd1bd
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 4 deletions.
diff --git a/src/grammar.rs b/src/grammar.rs
@@ -8,6 +8,7 @@ use parse_error::ParseError;
 use preparser::{Preparser, Syntax};
 use render::{self, template};
 use tokenizer::{Tokenizer, TokenStream, Token, Kind};
+use validators::Validator;
 use {Options, Pos};
 
 
@@ -70,6 +71,7 @@ pub enum StatementCode {
     Output {
         left_ws: OutputMode,
         expr: Expr,
+        validator: Option<Validator>,
         right_ws: OutputMode,
     },
     Cond {
@@ -333,7 +335,8 @@ fn expression<'a>(input: TokenStream<'a>)
     .map(|((start, expr), end)| {
         let left_ws = OutputMode::start(&start);
         let right_ws = OutputMode::end(&end);
-        StatementCode::Output { left_ws, expr, right_ws }
+        // TODO(tailhook) parse validator
+        StatementCode::Output { left_ws, expr, validator: None, right_ws }
     })
     .parse_stream(input)
 }

diff --git a/src/oneline.rs b/src/oneline.rs
@@ -40,7 +40,7 @@ impl Postprocess {
                 }
             };
             match st[i].code {
-                Output { ref mut left_ws, expr: _, ref mut right_ws } => {
+                Output { ref mut left_ws, ref mut right_ws, .. } => {
                     if *left_ws == Preserve {
                         *left_ws = if fix_start { Space } else { Strip };
                     }

diff --git a/src/render.rs b/src/render.rs
@@ -277,7 +277,7 @@ fn write_block<'x, 'render>(r: &mut Renderer,
                     }
                 }
             }
-            Output { left_ws, expr: _, right_ws } => {
+            Output { left_ws, right_ws, .. } => {
                 match min(left_ws, r.tail_mode) {
                     Preserve => {},
                     Strip => {
@@ -293,7 +293,7 @@ fn write_block<'x, 'render>(r: &mut Renderer,
                     }
                 }
                 let e = items.clone().map(|x| match x[idx].code {
-                    Output { left_ws: _, ref expr, right_ws: _ } => expr,
+                    Output { ref expr, .. } => expr,
                     _ => unreachable!(),
                 });
                 let var = &eval_expr(r, root, &e);

diff --git a/src/tests/body.rs b/src/tests/body.rs
@@ -57,6 +57,7 @@ fn var() {
                     position: line(1, 5, 6),
                     code: Var(String::from("x")),
                 },
+                validator: None,
                 right_ws: Preserve,
             },
         },
@@ -172,6 +173,7 @@ fn iteration() {
                                     position: line(3, 8, 9),
                                     code: Var("x".into()),
                                 },
+                                validator: None,
                                 right_ws: Preserve,
                             },
                         },

diff --git a/src/validators.rs b/src/validators.rs
@@ -6,3 +6,15 @@ pub enum Validator {
     Anything,
     Regex(Regex),
 }
+
+impl PartialEq for Validator {
+    fn eq(&self, other: &Validator) -> bool {
+        use self::Validator::*;
+        match (self, other) {
+            (&Anything, &Anything) => true,
+            (&Anything, &Regex(..)) => false,
+            (&Regex(..), &Anything) => false,
+            (&Regex(ref a), &Regex(ref b)) => a.as_str() == b.as_str(),
+        }
+    }
+}