1 files changed, 14 insertions, 2 deletions

diff --git a/src/parser.rs b/src/parser.rs
index 6e479e4..07bbd93 100644
--- a/src/parser.rs
+++ b/src/parser.rs
@@ -316,7 +316,10 @@ impl Parser {
                     return self.lex_error( &ctx.cur().unwrap() );
                 }
                 _ => {
-                    ctx.next();
+                    return Err(ParseError{
+                        position: *ctx.cur().unwrap().start(),
+                        what: format!("Unexpected tag in view root: {:?}", ctx.cur().unwrap().symbol())
+                    });
                 }
             }
         }
@@ -387,6 +390,7 @@ impl Parser {
                 what: "Tag should be <| |] style end tag.".to_string(),
             });
         }
+        ctx.next();
         Ok(name)
     }
 
@@ -425,7 +429,10 @@ impl Parser {
                     return self.lex_error( &ctx.cur().unwrap() );
                 }
                 _ => {
-
+                    return Err(ParseError{
+                        position: ctx.cur().unwrap().start().clone(),
+                        what: format!("Unexpected token: {:?}", ctx.cur().unwrap().symbol()),
+                    });
                 }
             }
         }
@@ -518,6 +525,7 @@ struct TagBuilder<'a> {
     start_pos: Position,
 }
 
+#[derive(Debug)]
 enum ParamValue {
     Literal(String),
     Identifier(Identifier),
@@ -567,6 +575,10 @@ impl<'a> TagBuilder<'a> {
         self.name
     }
 
+    pub fn params(&self) -> &Vec<ParamValue> {
+        &self.params
+    }
+
     pub fn set_name(&mut self, name: Symbol<'a>) {
         self.name = Some(name);
     }