Skip to content
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
Closed
Changes from 1 commit
Commits
File filter...
Filter file types
Jump to…
Jump to file
Failed to load files.

Always

Just for now

Remove stray changes

  • Loading branch information
dzbarsky committed Aug 21, 2015
commit 283d04e301a05b67b76582eed9c3069f78d87eeb
@@ -992,7 +992,7 @@ impl InlineFlow {
let percent_offset = line_height.scale_by(calc.percentage());
offset_from_baseline = offset_from_baseline - percent_offset - calc.length()
}
}
}
}
(offset_from_baseline - ascent, largest_size_updated)
}
@@ -410,8 +410,7 @@ pub mod specified {
}
}

let sum = CalcSumNode { products: products };
Ok(sum)
Ok(CalcSumNode { products: products })
}

fn parse_product(input: &mut Parser) -> Result<CalcProductNode, ()> {
@@ -442,8 +441,7 @@ pub mod specified {
}
}

let sum = CalcProductNode { values: values };
Ok(sum)
Ok(CalcProductNode { values: values })
}

fn parse_value(input: &mut Parser) -> Result<CalcValueNode, ()> {
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.