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

Expand out nested products

Browse source
This commit is contained in:
David Zbarsky 2015-08-14 22:43:17 -04:00
parent f8bd7c46ae
commit 164af05ba9
1 changed files with 29 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

32
components/style/values.rs
View file

@ -491,13 +491,39 @@ pub mod specified {
Some(product)
}
fn simplify_products(node: CalcProductNode) -> Result<CalcAstNode, ()> {
fn simplify_products_in_sum(node: &CalcSumNode) -> Result<CalcValueNode, ()> {
let mut simplified = Vec::new();
let node = node.clone();
for product in node.products {
match try!(Calc::simplify_product(product)) {
CalcAstNode::Value(val) =>
simplified.push(CalcProductNode { values: vec!(val) }),
CalcAstNode::Add(sum) => simplified.push_all(&sum.products),
}
}
if simplified.len() == 1 {
assert!(simplified[0].values.len() == 1);
Ok(simplified[0].values[0].clone())
} else {
Ok(CalcValueNode::Sum(box CalcSumNode { products: simplified } ))
}
}
fn simplify_product(node: CalcProductNode) -> Result<CalcAstNode, ()> {
let mut multiplier = 1.;
let mut node_with_unit = None;
for node in node.values {
match Calc::simplify_value_numerically(&node) {
Some(number) => multiplier *= number,
_ if node_with_unit.is_none() => node_with_unit = Some(node),
_ if node_with_unit.is_none() => {
node_with_unit = Some(match node {
CalcValueNode::Sum(box ref sum) =>
try!(Calc::simplify_products_in_sum(sum)),
val => val,
})
},
//_ if node_with_unit.is_none() => node_with_unit = Some(node),
_ => return Err(()),
}
}
@ -545,7 +571,7 @@ pub mod specified {
let mut simplified = Vec::new();
for node in ast.products {
let node = try!(Calc::simplify_products(node));
let node = try!(Calc::simplify_product(node));
match node {
CalcAstNode::Value(value) => simplified.push(value),
CalcAstNode::Add(sum) => {