Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-07 06:25:32 +01:00
Code Issues Projects Releases Packages Wiki Activity

Revert "Refactor content property parsing."

Browse source 
This reverts commit 50800940dc.
This commit is contained in:
Simon Sapin 2015-03-03 21:16:03 +01:00
parent e590f9b7f4
commit 7a218b3f08
1 changed files with 109 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

136
components/style/properties.mako.rs
View file

@ -760,6 +760,7 @@ pub mod longhands {
<%self:longhand name="content"> <%self:longhand name="content">
use cssparser::{ToCss, Token}; use cssparser::{ToCss, Token};
use std::ascii::AsciiExt; use std::ascii::AsciiExt;
use std::borrow::ToOwned;
use values::computed::ComputedValueAsSpecified; use values::computed::ComputedValueAsSpecified;
use super::list_style_type; use super::list_style_type;
@ -869,35 +870,116 @@ pub mod longhands {
content.push(ContentItem::String(value.into_owned())) content.push(ContentItem::String(value.into_owned()))
} }
Ok(Token::Function(name)) => { Ok(Token::Function(name)) => {
content.push(try!(match_ignore_ascii_case! { name, if name.eq_ignore_ascii_case("counter") {
"counter" => input.parse_nested_block(|input| { let (mut counter_name, mut counter_style) = (None, None);
let name = try!(input.expect_ident()).into_owned(); match input.parse_nested_block(|input| {
let style = input.try(|input| { input.parse_comma_separated(|input| {
try!(input.expect_comma()); if counter_name.is_none() {
list_style_type::parse(context, input) match input.next() {
}).unwrap_or(list_style_type::computed_value::T::decimal); Ok(Token::Ident(value)) => {
Ok(ContentItem::Counter(name, style)) counter_name = Some((*value).to_owned());
}), Ok(())
"counters" => input.parse_nested_block(|input| { }
let name = try!(input.expect_ident()).into_owned(); _ => Err(())
try!(input.expect_comma()); }
let separator = try!(input.expect_string()).into_owned(); } else if counter_style.is_none() {
let style = input.try(|input| { match list_style_type::parse(context, input) {
try!(input.expect_comma()); Ok(style) => {
list_style_type::parse(context, input) counter_style = Some(style);
}).unwrap_or(list_style_type::computed_value::T::decimal); Ok(())
Ok(ContentItem::Counters(name, separator, style)) }
}) _ => Err(())
_ => return Err(()) }
})); } else {
Err(())
}
})
}) {
Ok(_) => {
match (counter_name, counter_style) {
(Some(name), Some(style)) => {
content.push(ContentItem::Counter(name, style))
}
(Some(name), None) => {
content.push(ContentItem::Counter(
name,
list_style_type::computed_value::T::decimal))
}
_ => return Err(()),
}
}
Err(_) => return Err(()),
}
} else if name.eq_ignore_ascii_case("counters") {
let mut counter_name = None;
let mut counter_separator = None;
let mut counter_style = None;
match input.parse_nested_block(|input| {
input.parse_comma_separated(|input| {
if counter_name.is_none() {
match input.next() {
Ok(Token::Ident(value)) => {
counter_name = Some((*value).to_owned());
Ok(())
}
_ => Err(())
}
} else if counter_separator.is_none() {
match input.next() {
Ok(Token::QuotedString(value)) => {
counter_separator = Some((*value).to_owned());
Ok(())
}
_ => Err(())
}
} else if counter_style.is_none() {
match input.try(|input| {
list_style_type::parse(context, input)
}) {
Ok(style) => {
counter_style = Some(style);
Ok(())
}
_ => Err(()),
}
} else {
Err(())
}
})
}) {
Ok(_) => {
match (counter_name, counter_separator, counter_style) {
(Some(name), Some(separator), Some(style)) => {
content.push(ContentItem::Counters(name,
separator,
style))
}
(Some(name), Some(separator), None) => {
content.push(ContentItem::Counters(
name,
separator,
list_style_type::computed_value::T::decimal))
}
_ => return Err(()),
}
}
Err(_) => return Err(()),
}
} else {
return Err(())
}
} }
Ok(Token::Ident(ident)) => { Ok(Token::Ident(ident)) => {
match_ignore_ascii_case! { ident, if ident.eq_ignore_ascii_case("open-quote") {
"open-quote" => content.push(ContentItem::OpenQuote), content.push(ContentItem::OpenQuote)
"close-quote" => content.push(ContentItem::CloseQuote), } else if ident.eq_ignore_ascii_case("close-quote") {
"no-open-quote" => content.push(ContentItem::NoOpenQuote), content.push(ContentItem::CloseQuote)
"no-close-quote" => content.push(ContentItem::NoCloseQuote) } else if ident.eq_ignore_ascii_case("no-open-quote") {
_ => return Err(()) content.push(ContentItem::NoOpenQuote)
} else if ident.eq_ignore_ascii_case("no-close-quote") {
content.push(ContentItem::NoCloseQuote)
} else {
return Err(())
} }
} }
Err(()) if !content.is_empty() => { Err(()) if !content.is_empty() => {