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

Auto merge of #15873 - emilio:calc, r=nox

Browse source 
style: Allow trailing whitespace in a calc expression.

This should fix Gecko failures like: https://treeherder.mozilla.org/logviewer.html#?job_id=82470557&repo=autoland&lineNumber=1789

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/15873)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2017-03-08 08:21:40 -08:00 • committed by GitHub
commit 728a249dea
2 changed files with 25 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

45
components/style/values/specified/length.rs
View file

@ -585,33 +585,32 @@ impl CalcLengthOrPercentage {
products.push(try!(CalcLengthOrPercentage::parse_product(input, expected_unit))); products.push(try!(CalcLengthOrPercentage::parse_product(input, expected_unit)));
loop { loop {
let position = input.position(); let position = input.position();
match input.next_including_whitespace() { match input.next_including_whitespace() {
Ok(Token::WhiteSpace(_)) => { Ok(Token::WhiteSpace(_)) => {
match input.next() { if input.is_exhausted() {
Ok(Token::Delim('+')) => { break; // allow trailing whitespace
products.push(try!(CalcLengthOrPercentage::parse_product(input, expected_unit))); }
match input.next() {
Ok(Token::Delim('+')) => {
products.push(try!(CalcLengthOrPercentage::parse_product(input, expected_unit)));
}
Ok(Token::Delim('-')) => {
let mut right = try!(CalcLengthOrPercentage::parse_product(input, expected_unit));
right.values.push(CalcValueNode::Number(-1.));
products.push(right);
}
_ => {
return Err(());
}
}
} }
Ok(Token::Delim('-')) => {
let mut right = try!(CalcLengthOrPercentage::parse_product(input, expected_unit));
right.values.push(CalcValueNode::Number(-1.));
products.push(right);
}
_ => { _ => {
return Err(()); input.reset(position);
break
} }
}
} }
_ => { }
input.reset(position);
break
}
}
}
Ok(CalcSumNode { products: products }) Ok(CalcSumNode { products: products })
} }

3
tests/unit/style/parsing/length.rs
View file

@ -9,4 +9,7 @@ use style::values::specified::length::Length;
#[test] #[test]
fn test_calc() { fn test_calc() {
assert!(parse(Length::parse, "calc(1px+ 2px)").is_err()); assert!(parse(Length::parse, "calc(1px+ 2px)").is_err());
assert!(parse(Length::parse, "calc( 1px + 2px )").is_ok());
assert!(parse(Length::parse, "calc(1px + 2px )").is_ok());
assert!(parse(Length::parse, "calc( 1px + 2px)").is_ok());
} }