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

Auto merge of #11495 - mitchhentges:9283-rect-no-comma, r=SimonSapin

Browse source 
Fix 9283 - space or comma separated rect() arguments

<!-- Please describe your changes on the following line: -->
Allow either commas or space to separate `rect()` arguments, but not both. Don't allocate unnecessary `Vec`

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [X] These changes fix #9283

<!-- Either: -->
- [X] There are tests for these changes OR

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/11495)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-05-30 13:49:47 -05:00
commit 509c04cab8
1 changed files with 31 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

48
components/style/properties/longhand/effects.mako.rs
View file

@ -344,31 +344,45 @@ ${helpers.predefined_type("opacity",
use std::ascii::AsciiExt; use std::ascii::AsciiExt;
use values::specified::Length; use values::specified::Length;
fn parse_argument(input: &mut Parser) -> Result<Option<Length>, ()> {
if input.try(|input| input.expect_ident_matching("auto")).is_ok() {
Ok(None)
} else {
Length::parse(input).map(Some)
}
}
if input.try(|input| input.expect_ident_matching("auto")).is_ok() { if input.try(|input| input.expect_ident_matching("auto")).is_ok() {
return Ok(SpecifiedValue(None)) return Ok(SpecifiedValue(None))
} }
if !try!(input.expect_function()).eq_ignore_ascii_case("rect") { if !try!(input.expect_function()).eq_ignore_ascii_case("rect") {
return Err(()) return Err(())
} }
let sides = try!(input.parse_nested_block(|input| {
input.parse_comma_separated(|input| { input.parse_nested_block(|input| {
if input.try(|input| input.expect_ident_matching("auto")).is_ok() { let top = try!(parse_argument(input));
Ok(None) let right;
} else { let bottom;
Length::parse(input).map(Some) let left;
}
}) if input.try(|input| input.expect_comma()).is_ok() {
})); right = try!(parse_argument(input));
if sides.len() == 4 { try!(input.expect_comma());
bottom = try!(parse_argument(input));
try!(input.expect_comma());
left = try!(parse_argument(input));
} else {
right = try!(parse_argument(input));
bottom = try!(parse_argument(input));
left = try!(parse_argument(input));
}
Ok(SpecifiedValue(Some(SpecifiedClipRect { Ok(SpecifiedValue(Some(SpecifiedClipRect {
top: sides[0].unwrap_or(Length::Absolute(Au(0))), top: top.unwrap_or(Length::Absolute(Au(0))),
right: sides[1], right: right,
bottom: sides[2], bottom: bottom,
left: sides[3].unwrap_or(Length::Absolute(Au(0))), left: left.unwrap_or(Length::Absolute(Au(0))),
}))) })))
} else { })
Err(())
}
} }
</%helpers:longhand> </%helpers:longhand>