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

Properly forbid legacy keywords in modern gradient syntax

Browse source
This commit is contained in:
Anthony Ramine 2017-04-20 13:11:13 +02:00
parent 26fd65995d
commit de1fb76ac1
1 changed files with 14 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

24
components/style/values/specified/image.rs
View file

@ -372,7 +372,7 @@ fn parse_shape<F>(context: &ParserContext,
input: &mut Parser, input: &mut Parser,
parse_size_keyword: F) parse_size_keyword: F)
-> Result<EndingShape, ()> -> Result<EndingShape, ()>
where F: FnOnce(&mut Parser) -> Result<SizeKeyword, ()> where F: Fn(&mut Parser) -> Result<SizeKeyword, ()>
{ {
if let Ok((first, second)) = input.try(|i| parse_two_length(context, i)) { if let Ok((first, second)) = input.try(|i| parse_two_length(context, i)) {
// Handle <LengthOrPercentage> <LengthOrPercentage> <shape>? // Handle <LengthOrPercentage> <LengthOrPercentage> <shape>?
@ -382,7 +382,7 @@ fn parse_shape<F>(context: &ParserContext,
// Handle <Length> <circle>? // Handle <Length> <circle>?
let _ = input.try(|input| input.expect_ident_matching("circle")); let _ = input.try(|input| input.expect_ident_matching("circle"));
Ok(EndingShape::Circle(LengthOrKeyword::Length(length))) Ok(EndingShape::Circle(LengthOrKeyword::Length(length)))
} else if let Ok(keyword) = input.try(parse_size_keyword) { } else if let Ok(keyword) = input.try(&parse_size_keyword) {
// Handle <keyword> <shape-keyword>? // Handle <keyword> <shape-keyword>?
if input.try(|input| input.expect_ident_matching("circle")).is_ok() { if input.try(|input| input.expect_ident_matching("circle")).is_ok() {
Ok(EndingShape::Circle(LengthOrKeyword::Keyword(keyword))) Ok(EndingShape::Circle(LengthOrKeyword::Keyword(keyword)))
@ -394,12 +394,12 @@ fn parse_shape<F>(context: &ParserContext,
// https://github.com/rust-lang/rust/issues/41272 // https://github.com/rust-lang/rust/issues/41272
if input.try(|input| input.expect_ident_matching("ellipse")).is_ok() { if input.try(|input| input.expect_ident_matching("ellipse")).is_ok() {
// Handle <ellipse> <LengthOrPercentageOrKeyword>? // Handle <ellipse> <LengthOrPercentageOrKeyword>?
let length = input.try(|i| LengthOrPercentageOrKeyword::parse(context, i)) let length = input.try(|i| LengthOrPercentageOrKeyword::parse(context, i, parse_size_keyword))
.unwrap_or(LengthOrPercentageOrKeyword::Keyword(SizeKeyword::FarthestCorner)); .unwrap_or(LengthOrPercentageOrKeyword::Keyword(SizeKeyword::FarthestCorner));
Ok(EndingShape::Ellipse(length)) Ok(EndingShape::Ellipse(length))
} else if input.try(|input| input.expect_ident_matching("circle")).is_ok() { } else if input.try(|input| input.expect_ident_matching("circle")).is_ok() {
// Handle <circle> <LengthOrKeyword>? // Handle <circle> <LengthOrKeyword>?
let length = input.try(|i| LengthOrKeyword::parse(context, i)) let length = input.try(|i| LengthOrKeyword::parse(context, i, parse_size_keyword))
.unwrap_or(LengthOrKeyword::Keyword(SizeKeyword::FarthestCorner)); .unwrap_or(LengthOrKeyword::Keyword(SizeKeyword::FarthestCorner));
Ok(EndingShape::Circle(length)) Ok(EndingShape::Circle(length))
} else { } else {
@ -539,9 +539,11 @@ pub enum LengthOrKeyword {
Keyword(SizeKeyword), Keyword(SizeKeyword),
} }
impl Parse for LengthOrKeyword { impl LengthOrKeyword {
fn parse(context: &ParserContext, input: &mut Parser) -> Result<Self, ()> { fn parse<F>(context: &ParserContext, input: &mut Parser, parse_size_keyword: F) -> Result<Self, ()>
if let Ok(keyword) = input.try(SizeKeyword::parse) { where F: Fn(&mut Parser) -> Result<SizeKeyword, ()>
{
if let Ok(keyword) = input.try(parse_size_keyword) {
Ok(LengthOrKeyword::Keyword(keyword)) Ok(LengthOrKeyword::Keyword(keyword))
} else { } else {
Ok(LengthOrKeyword::Length(try!(Length::parse(context, input)))) Ok(LengthOrKeyword::Length(try!(Length::parse(context, input))))
@ -568,9 +570,11 @@ pub enum LengthOrPercentageOrKeyword {
} }
impl Parse for LengthOrPercentageOrKeyword { impl LengthOrPercentageOrKeyword {
fn parse(context: &ParserContext, input: &mut Parser) -> Result<Self, ()> { fn parse<F>(context: &ParserContext, input: &mut Parser, parse_size_keyword: F) -> Result<Self, ()>
if let Ok(keyword) = input.try(SizeKeyword::parse) { where F: Fn(&mut Parser) -> Result<SizeKeyword, ()>
{
if let Ok(keyword) = input.try(parse_size_keyword) {
Ok(LengthOrPercentageOrKeyword::Keyword(keyword)) Ok(LengthOrPercentageOrKeyword::Keyword(keyword))
} else { } else {
Ok(LengthOrPercentageOrKeyword::LengthOrPercentage( Ok(LengthOrPercentageOrKeyword::LengthOrPercentage(