diff options
Diffstat (limited to 'components/style/selectors.rs')
| -rw-r--r-- | components/style/selectors.rs | 55 |
1 files changed, 40 insertions, 15 deletions
diff --git a/components/style/selectors.rs b/components/style/selectors.rs index 7a6f8637cda..6c783e70349 100644 --- a/components/style/selectors.rs +++ b/components/style/selectors.rs @@ -61,9 +61,9 @@ pub enum SimpleSelector { // Attribute selectors AttrExists(AttrSelector), // [foo] - AttrEqual(AttrSelector, String), // [foo=bar] + AttrEqual(AttrSelector, String, CaseSensitivity), // [foo=bar] AttrIncludes(AttrSelector, String), // [foo~=bar] - AttrDashMatch(AttrSelector, String, String), // [foo|=bar] Second string is the first + "-" + AttrDashMatch(AttrSelector, String, String), // [foo|=bar] Second string is the first + "-" AttrPrefixMatch(AttrSelector, String), // [foo^=bar] AttrSubstringMatch(AttrSelector, String), // [foo*=bar] AttrSuffixMatch(AttrSelector, String), // [foo$=bar] @@ -90,6 +90,14 @@ pub enum SimpleSelector { // ... } + +#[deriving(Eq, PartialEq, Clone, Hash)] +pub enum CaseSensitivity { + CaseSensitive, // Selectors spec says language-defined, but HTML says sensitive. + CaseInsensitive, +} + + #[deriving(Eq, PartialEq, Clone, Hash)] pub struct LocalName { pub name: Atom, @@ -446,25 +454,21 @@ fn parse_attribute_selector(content: Vec<ComponentValue>, namespaces: &Namespace }; skip_whitespace(iter); // TODO: deal with empty value or value containing whitespace (see spec) - macro_rules! get_value( () => {{ - skip_whitespace(iter); - match iter.next() { - Some(Ident(value)) | Some(QuotedString(value)) => value, - _ => return Err(()) - } - }};) let result = match iter.next() { None => AttrExists(attr), // [foo] - Some(Delim('=')) => AttrEqual(attr, (get_value!())), // [foo=bar] - Some(IncludeMatch) => AttrIncludes(attr, (get_value!())), // [foo~=bar] + Some(Delim('=')) => AttrEqual( + attr, try!(parse_attribute_value(iter)), + try!(parse_attribute_flags(iter))), // [foo=bar] + Some(IncludeMatch) => AttrIncludes(attr, try!(parse_attribute_value(iter))), // [foo~=bar] Some(DashMatch) => { - let value = get_value!(); + let value = try!(parse_attribute_value(iter)); let dashing_value = format!("{}-", value); AttrDashMatch(attr, value, dashing_value) // [foo|=bar] }, - Some(PrefixMatch) => AttrPrefixMatch(attr, (get_value!())), // [foo^=bar] - Some(SubstringMatch) => AttrSubstringMatch(attr, (get_value!())), // [foo*=bar] - Some(SuffixMatch) => AttrSuffixMatch(attr, (get_value!())), // [foo$=bar] + Some(PrefixMatch) => AttrPrefixMatch(attr, try!(parse_attribute_value(iter))), // [foo^=bar] + // [foo*=bar] + Some(SubstringMatch) => AttrSubstringMatch(attr, try!(parse_attribute_value(iter))), + Some(SuffixMatch) => AttrSuffixMatch(attr, try!(parse_attribute_value(iter))), // [foo$=bar] _ => return Err(()) }; skip_whitespace(iter); @@ -472,6 +476,27 @@ fn parse_attribute_selector(content: Vec<ComponentValue>, namespaces: &Namespace } +fn parse_attribute_value<I: Iterator<ComponentValue>>(iter: &mut Iter<I>) -> Result<String, ()> { + skip_whitespace(iter); + match iter.next() { + Some(Ident(value)) | Some(QuotedString(value)) => Ok(value), + _ => Err(()) + } +} + + +fn parse_attribute_flags<I: Iterator<ComponentValue>>(iter: &mut Iter<I>) + -> Result<CaseSensitivity, ()> { + skip_whitespace(iter); + match iter.next() { + None => Ok(CaseSensitive), + Some(Ident(ref value)) if value.as_slice().eq_ignore_ascii_case("i") + => Ok(CaseInsensitive), + _ => Err(()) + } +} + + fn parse_simple_pseudo_class(name: &str) -> Result<SimpleSelector, ()> { match name.to_ascii_lower().as_slice() { "any-link" => Ok(AnyLink), |