shadowfacts/grass
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

implement zip method to combine super selectors

Browse Source
This commit is contained in:
ConnorSkees 2020-01-05 12:25:03 -05:00
parent e5f70e0a7a
commit 05d67e404d
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/selector.rs
View File

@ -32,6 +32,8 @@ pub enum Selector {
Attribute(Attribute), Attribute(Attribute),
/// Pseudo selector: `:hover` /// Pseudo selector: `:hover`
Pseudo(String), Pseudo(String),
/// Used to signify no selector (when there is no super_selector of a rule)
None,
} }
impl Display for Selector { impl Display for Selector {
@ -49,6 +51,7 @@ impl Display for Selector {
Selector::Preceding(lhs, rhs) => write!(f, "{} ~ {}", lhs, rhs), Selector::Preceding(lhs, rhs) => write!(f, "{} ~ {}", lhs, rhs),
Selector::Attribute(attr) => write!(f, "{}", attr), Selector::Attribute(attr) => write!(f, "{}", attr),
Selector::Pseudo(s) => write!(f, ":{}", s), Selector::Pseudo(s) => write!(f, ":{}", s),
Selector::None => write!(f, ""),
} }
} }
} }
@ -183,6 +186,19 @@ impl Selector {
pub fn from_tokens(tokens: Peekable<Iter<Token>>) -> Selector { pub fn from_tokens(tokens: Peekable<Iter<Token>>) -> Selector {
SelectorParser::new(tokens).all_selectors() SelectorParser::new(tokens).all_selectors()
} }
pub fn zip(self, other: Selector) -> Selector {
if let Selector::Multiple(lhs, rhs) = other {
return Selector::Multiple(Box::new(self.clone().zip(*lhs)), Box::new(self.zip(*rhs)));
}
match self {
Selector::Multiple(lhs, rhs) => {
Selector::Multiple(Box::new(lhs.zip(other.clone())), Box::new(rhs.zip(other)))
}
Selector::None => other,
_ => Selector::Descendant(Box::new(self), Box::new(other)),
}
}
} }
#[derive(Clone, Debug, Eq, PartialEq)] #[derive(Clone, Debug, Eq, PartialEq)]