Skip to content

/ servo

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[not ready for review yet] Allow calc expressions when parsing numbers #7308

Closed
wants to merge 17 commits into from
+584 −79
Closed

[not ready for review yet] Allow calc expressions when parsing numbers #7308

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
731d9f0
Implement Calc for LengthOrPercentage
dzbarsky Aug 11, 2015
8b98166
Implement Calc for LengthOrPercentageOrAutoOrNone
dzbarsky Aug 12, 2015
da62ff0
Implement proper calc parsing
dzbarsky Aug 12, 2015
4d0b978
Implement font relative and viewport relative units for calc
dzbarsky Aug 12, 2015
4c90204
Clean up serialization and other hacks
dzbarsky Aug 13, 2015
756fee4
Clean up serialization code a little
dzbarsky Aug 13, 2015
0c84a92
Clean up AST simplification code
dzbarsky Aug 13, 2015
d380f16
Properly serialize % values in calc expressions
dzbarsky Aug 13, 2015
13989a7
Simplify like terms in all sum expressions, not just toplevel calc
dzbarsky Aug 13, 2015
c3fca86
Simplify the calc AST simplification code
dzbarsky Aug 13, 2015
283d04e
Remove stray changes
dzbarsky Aug 13, 2015
f2045bd
Fix some calc parsing panics
dzbarsky Aug 14, 2015
c7a212b
Expand out nested products
dzbarsky Aug 15, 2015
4127bd5
Use the type system to enforce that product nodes are simplified away
dzbarsky Aug 15, 2015
5e47273
Get rid of some cloning
dzbarsky Aug 15, 2015
066e4c0
Clean up some stray lines
dzbarsky Aug 15, 2015
65fd35d
Allow calc expressions when parsing numbers
dzbarsky Aug 20, 2015
File filter...
Filter file types
Clear filters
Jump to…
Jump to file
Failed to load files.

Always

Just for now

Prev
Loading status checks…

Allow calc expressions when parsing numbers

  • Loading branch information
@dzbarsky
dzbarsky committed Aug 21, 2015
commit 65fd35df20d0da64f91b28a824e0bf02386b8271
1 components/layout/fragment.rs
View file
Open in desktop
@@ -1289,6 +1289,7 @@ impl Fragment {
}
(Some(dom_inline_size), _) => dom_inline_size,
(None, LengthOrPercentageOrAuto::Length(length)) => length,
(None, LengthOrPercentageOrAuto::Calc(calc)) => calc.length(),
};
result.union_block(&IntrinsicISizes {
minimum_inline_size: image_inline_size,
60 components/style/properties.mako.rs
View file
Open in desktop
@@ -2678,7 +2678,7 @@ pub mod longhands {
}
}
fn parse(_context: &ParserContext, input: &mut Parser) -> Result<SpecifiedValue, ()> {
input.expect_number().map(SpecifiedValue)
specified::parse_number(input).map(SpecifiedValue)
}
</%self:longhand>

@@ -3542,10 +3542,10 @@ pub mod longhands {
}

fn parse_two_floats(input: &mut Parser) -> Result<(CSSFloat,CSSFloat),()> {
let first = try!(input.expect_number());
let first = try!(specified::parse_number(input));
let second = input.try(|input| {
try!(input.expect_comma());
input.expect_number()
specified::parse_number(input)
}).unwrap_or(first);
Ok((first, second))
}
@@ -3676,7 +3676,7 @@ pub mod longhands {
"matrix" => {
try!(input.parse_nested_block(|input| {
let values = try!(input.parse_comma_separated(|input| {
input.expect_number()
specified::parse_number(input)
}));
if values.len() != 6 {
return Err(())
@@ -3694,7 +3694,7 @@ pub mod longhands {
"matrix3d" => {
try!(input.parse_nested_block(|input| {
let values = try!(input.parse_comma_separated(|input| {
input.expect_number()
specified::parse_number(input)
}));
if values.len() != 16 {
return Err(())
@@ -3777,32 +3777,32 @@ pub mod longhands {
},
"scalex" => {
try!(input.parse_nested_block(|input| {
let sx = try!(input.expect_number());
let sx = try!(specified::parse_number(input));
result.push(SpecifiedOperation::Scale(sx, 1.0, 1.0));
Ok(())
}))
},
"scaley" => {
try!(input.parse_nested_block(|input| {
let sy = try!(input.expect_number());
let sy = try!(specified::parse_number(input));
result.push(SpecifiedOperation::Scale(1.0, sy, 1.0));
Ok(())
}))
},
"scalez" => {
try!(input.parse_nested_block(|input| {
let sz = try!(input.expect_number());
let sz = try!(specified::parse_number(input));
result.push(SpecifiedOperation::Scale(1.0, 1.0, sz));
Ok(())
}))
},
"scale3d" => {
try!(input.parse_nested_block(|input| {
let sx = try!(input.expect_number());
let sx = try!(specified::parse_number(input));
try!(input.expect_comma());
let sy = try!(input.expect_number());
let sy = try!(specified::parse_number(input));
try!(input.expect_comma());
let sz = try!(input.expect_number());
let sz = try!(specified::parse_number(input));
result.push(SpecifiedOperation::Scale(sx, sy, sz));
Ok(())
}))
@@ -3837,11 +3837,11 @@ pub mod longhands {
},
"rotate3d" => {
try!(input.parse_nested_block(|input| {
let ax = try!(input.expect_number());
let ax = try!(specified::parse_number(input));
try!(input.expect_comma());
let ay = try!(input.expect_number());
let ay = try!(specified::parse_number(input));
try!(input.expect_comma());
let az = try!(input.expect_number());
let az = try!(specified::parse_number(input));
try!(input.expect_comma());
let theta = try!(specified::Angle::parse(input));
// TODO(gw): Check the axis can be normalized!!
@@ -3858,14 +3858,14 @@ pub mod longhands {
},
"skewx" => {
try!(input.parse_nested_block(|input| {
let sx = try!(input.expect_number());
let sx = try!(specified::parse_number(input));
result.push(SpecifiedOperation::Skew(sx, 1.0));
Ok(())
}))
},
"skewy" => {
try!(input.parse_nested_block(|input| {
let sy = try!(input.expect_number());
let sy = try!(specified::parse_number(input));
result.push(SpecifiedOperation::Skew(1.0, sy));
Ok(())
}))
@@ -3943,37 +3943,37 @@ pub mod longhands {
token,
"left" => {
if horizontal.is_none() {
horizontal = Some(specified::LengthOrPercentage::Percentage(0.0))
horizontal = Some(specified::LengthOrPercentage::Percentage(specified::Percentage(0.0)))
} else {
return Err(())
}
},
"center" => {
if horizontal.is_none() {
horizontal = Some(specified::LengthOrPercentage::Percentage(0.5))
horizontal = Some(specified::LengthOrPercentage::Percentage(specified::Percentage(0.5)))
} else if vertical.is_none() {
vertical = Some(specified::LengthOrPercentage::Percentage(0.5))
vertical = Some(specified::LengthOrPercentage::Percentage(specified::Percentage(0.5)))
} else {
return Err(())
}
},
"right" => {
if horizontal.is_none() {
horizontal = Some(specified::LengthOrPercentage::Percentage(1.0))
horizontal = Some(specified::LengthOrPercentage::Percentage(specified::Percentage(1.0)))
} else {
return Err(())
}
},
"top" => {
if vertical.is_none() {
vertical = Some(specified::LengthOrPercentage::Percentage(0.0))
vertical = Some(specified::LengthOrPercentage::Percentage(specified::Percentage(0.0)))
} else {
return Err(())
}
},
"bottom" => {
if vertical.is_none() {
vertical = Some(specified::LengthOrPercentage::Percentage(1.0))
vertical = Some(specified::LengthOrPercentage::Percentage(specified::Percentage(1.0)))
} else {
return Err(())
}
@@ -4072,8 +4072,8 @@ pub mod longhands {
pub fn parse(context: &ParserContext, input: &mut Parser) -> Result<SpecifiedValue,()> {
let result = try!(super::parse_origin(context, input));
Ok(SpecifiedValue {
horizontal: result.horizontal.unwrap_or(LengthOrPercentage::Percentage(0.5)),
vertical: result.vertical.unwrap_or(LengthOrPercentage::Percentage(0.5)),
horizontal: result.horizontal.unwrap_or(LengthOrPercentage::Percentage(specified::Percentage(0.5))),
vertical: result.vertical.unwrap_or(LengthOrPercentage::Percentage(specified::Percentage(0.5))),
depth: result.depth.unwrap_or(Length::Absolute(Au(0))),
})
}
@@ -4148,8 +4148,8 @@ pub mod longhands {
match result.depth {
Some(_) => Err(()),
None => Ok(SpecifiedValue {
horizontal: result.horizontal.unwrap_or(LengthOrPercentage::Percentage(0.5)),
vertical: result.vertical.unwrap_or(LengthOrPercentage::Percentage(0.5)),
horizontal: result.horizontal.unwrap_or(LengthOrPercentage::Percentage(specified::Percentage(0.5))),
vertical: result.vertical.unwrap_or(LengthOrPercentage::Percentage(specified::Percentage(0.5))),
})
}
}
@@ -4442,13 +4442,13 @@ pub mod longhands {
"cubic-bezier" => {
let (mut p1x, mut p1y, mut p2x, mut p2y) = (0.0, 0.0, 0.0, 0.0);
try!(input.parse_nested_block(|input| {
p1x = try!(input.expect_number());
p1x = try!(specified::parse_number(input));
try!(input.expect_comma());
p1y = try!(input.expect_number());
p1y = try!(specified::parse_number(input));
try!(input.expect_comma());
p2x = try!(input.expect_number());
p2x = try!(specified::parse_number(input));
try!(input.expect_comma());
p2y = try!(input.expect_number());
p2y = try!(specified::parse_number(input));
Ok(())
}));
let (p1, p2) = (Point2D::new(p1x, p1y), Point2D::new(p2x, p2y));
35 components/style/values.rs
View file
Open in desktop
@@ -410,6 +410,31 @@ pub mod specified {
}
}

pub fn parse_number(input: &mut Parser) -> Result<f32, ()> {
match try!(input.next()) {
Token::Number(ref value) => Ok(value.value),
Token::Function(ref name) if name.eq_ignore_ascii_case("calc") => {
let ast = try!(input.parse_nested_block(Calc::parse_sum));

let mut result = None;

for ref node in ast.products {
match try!(Calc::simplify_product(node)) {
SimplifiedValueNode::Number(val) =>
result = Some(result.unwrap_or(0.) + val),
_ => return Err(()),
}
}

match result {
Some(result) => Ok(result),
_ => Err(())
}
}
_ => Err(())
}
}

#[derive(Clone, PartialEq, Copy, Debug, HeapSizeOf)]
pub struct Calc {
pub absolute: Option<Au>,
@@ -476,13 +501,13 @@ pub mod specified {
}

fn parse_value(input: &mut Parser) -> Result<CalcValueNode, ()> {
match input.next() {
Ok(Token::Number(ref value)) => Ok(CalcValueNode::Number(value.value)),
Ok(Token::Dimension(ref value, ref unit)) =>
match try!(input.next()) {
Token::Number(ref value) => Ok(CalcValueNode::Number(value.value)),
Token::Dimension(ref value, ref unit) =>
Length::parse_dimension(value.value, unit).map(CalcValueNode::Length),
Ok(Token::Percentage(ref value)) =>
Token::Percentage(ref value) =>
Ok(CalcValueNode::Percentage(value.unit_value)),
Ok(Token::ParenthesisBlock) => {
Token::ParenthesisBlock => {
let result = try!(input.parse_nested_block(Calc::parse_sum));
Ok(CalcValueNode::Sum(box result))
},
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.