Remove tags (#37)

Author: zbraniecki

src/resolve.rs

@@ -98,28 +98,6 @@ impl ResolveValue for ast::Expression {
                 expression: None,
                 ref variants,
             } => select_default(variants).and_then(|variant| variant.value.to_value(env)),
-            ast::Expression::SelectExpression {
-                expression: Some(box ast::Expression::MessageReference { ref id }),
-                ref variants,
-            } => {
-                let tags = env.ctx
-                    .get_message(&id.name)
-                    .and_then(|message| message.tags.as_ref());
-
-                if let Some(tags) = tags {
-                    for variant in variants {
-                        if let ast::VarKey::Symbol(ref symbol) = variant.key {
-                            for tag in tags.iter() {
-                                if symbol.name == tag.name.name {
-                                    return variant.value.to_value(env);
-                                }
-                            }
-                        }
-                    }
-                }
-
-                select_default(variants).and_then(|variant| variant.value.to_value(env))
-            }
             ast::Expression::SelectExpression {
                 ref expression,
                 ref variants,

src/syntax/ast.rs

@@ -22,7 +22,6 @@ pub struct Message {
     pub id: Identifier,
     pub value: Option<Pattern>,
     pub attributes: Option<Vec<Attribute>>,
-    pub tags: Option<Vec<Tag>>,
     pub comment: Option<Comment>,
 }
 
@@ -80,11 +79,6 @@ pub struct Attribute {
     pub value: Pattern,
 }
 
-#[derive(Debug, PartialEq)]
-pub struct Tag {
-    pub name: Symbol,
-}
-
 #[derive(Debug, PartialEq)]
 pub struct Variant {
     pub key: VarKey,

src/syntax/ftlstream.rs

@@ -19,7 +19,6 @@ pub trait FTLParserStream<I> {
     fn is_peek_next_line_variant_start(&mut self) -> bool;
     fn is_peek_next_line_attribute_start(&mut self) -> bool;
     fn is_peek_next_line_pattern(&mut self) -> bool;
-    fn is_peek_next_line_tag_start(&mut self) -> bool;
     fn skip_to_next_entry_start(&mut self);
     fn take_id_start(&mut self) -> Result<char>;
     fn take_id_char(&mut self) -> Option<char>;
@@ -183,8 +182,8 @@ where
             return false;
         }
 
-        if self.current_peek_is('}') || self.current_peek_is('.') || self.current_peek_is('#')
-            || self.current_peek_is('[') || self.current_peek_is('*')
+        if self.current_peek_is('}') || self.current_peek_is('.') || self.current_peek_is('[')
+            || self.current_peek_is('*')
         {
             self.reset_peek();
             return false;
@@ -194,30 +193,6 @@ where
         true
     }
 
-    fn is_peek_next_line_tag_start(&mut self) -> bool {
-        if !self.current_peek_is('\n') {
-            return false;
-        }
-        self.peek();
-
-        let ptr = self.get_peek_index();
-
-        self.peek_line_ws();
-
-        if self.get_peek_index() - ptr == 0 {
-            self.reset_peek();
-            return false;
-        }
-
-        if self.current_peek_is('#') {
-            self.reset_peek();
-            return true;
-        }
-
-        self.reset_peek();
-        false
-    }
-
     fn skip_to_next_entry_start(&mut self) {
         while let Some(_) = self.next() {
             if self.current_is('\n') && !self.peek_char_is('\n')

src/syntax/parser.rs

@@ -170,15 +170,6 @@ where
         None
     };
 
-    let tags = if ps.is_peek_next_line_tag_start() {
-        if attributes.is_some() {
-            return error!(ErrorKind::Generic);
-        }
-        Some(get_tags(ps)?)
-    } else {
-        None
-    };
-
     if pattern.is_none() && attributes.is_none() {
         return error!(ErrorKind::MissingField {
             entry_id: id.name,
@@ -190,7 +181,6 @@ where
         id,
         value: pattern,
         attributes,
-        tags,
         comment,
     }))
 }
@@ -232,28 +222,6 @@ where
     Ok(attributes)
 }
 
-fn get_tags<I>(ps: &mut ParserStream<I>) -> Result<Vec<ast::Tag>>
-where
-    I: Iterator<Item = char>,
-{
-    let mut tags = vec![];
-    loop {
-        ps.expect_char('\n')?;
-        ps.skip_line_ws();
-
-        ps.expect_char('#')?;
-
-        let symbol = get_symbol(ps)?;
-
-        tags.push(ast::Tag { name: symbol });
-
-        if !ps.is_peek_next_line_tag_start() {
-            break;
-        }
-    }
-    Ok(tags)
-}
-
 fn get_identifier<I>(ps: &mut ParserStream<I>) -> Result<ast::Identifier>
 where
     I: Iterator<Item = char>,

tests/fixtures/parser/ftl/07-tags.ftl

@@ -240,6 +240,7 @@ baz-unknown =
 }
 
 #[test]
+#[ignore]
 fn select_expression_message_selector() {
     let mut ctx = MessageContext::new(&["x-testing"]);