Skip to content

Feat calc min max clamp #40

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.

Sign up for GitHub

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

Merged
TtTRz merged 2 commits into from
Aug 5, 2026
Merged

Feat calc min max clamp #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
55fd73d
fix(css): match dimension units case-insensitively
TtTRz Aug 5, 2026
b27bb58
feat(css): support min/max/clamp in calc
TtTRz Aug 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
169 changes: 169 additions & 0 deletions float-pigment-css/src/parser/property_value/calc.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,34 @@ impl ComputeCalcExpr<Angle> {
}
}
CalcExpr::Length(Length::Ratio(ratio)) => Some(Angle::from_ratio(*ratio)),
CalcExpr::Min(args) => {
let mut iter = args.iter();
let mut ret = Self::try_compute(iter.next()?)?.to_f32();
for arg in iter {
let v = Self::try_compute(arg)?.to_f32();
if v < ret {
ret = v;
}
}
Some(Angle::Rad(ret))
}
CalcExpr::Max(args) => {
let mut iter = args.iter();
let mut ret = Self::try_compute(iter.next()?)?.to_f32();
for arg in iter {
let v = Self::try_compute(arg)?.to_f32();
if v > ret {
ret = v;
}
}
Some(Angle::Rad(ret))
}
CalcExpr::Clamp(min, val, max) => {
let mn = Self::try_compute(min)?.to_f32();
let v = Self::try_compute(val)?.to_f32();
let mx = Self::try_compute(max)?.to_f32();
Some(Angle::Rad(v.max(mn).min(mx)))
}
_ => None,
}
}
Expand All @@ -199,6 +227,34 @@ impl ComputeCalcExpr<Number> {
_ => None,
}
}
CalcExpr::Min(args) => {
let mut iter = args.iter();
let mut ret = Self::try_compute(iter.next()?)?.to_f32();
for arg in iter {
let v = Self::try_compute(arg)?.to_f32();
if v < ret {
ret = v;
}
}
Some(Number::F32(ret))
}
CalcExpr::Max(args) => {
let mut iter = args.iter();
let mut ret = Self::try_compute(iter.next()?)?.to_f32();
for arg in iter {
let v = Self::try_compute(arg)?.to_f32();
if v > ret {
ret = v;
}
}
Some(Number::F32(ret))
}
CalcExpr::Clamp(min, val, max) => {
let mn = Self::try_compute(min)?.to_f32();
let v = Self::try_compute(val)?.to_f32();
let mx = Self::try_compute(max)?.to_f32();
Some(Number::F32(v.max(mn).min(mx)))
}
_ => None,
}
}
Expand Down Expand Up @@ -269,6 +325,55 @@ impl ComputeCalcExpr<Length> {
//
None
}
CalcExpr::Min(args) => {
let mut iter = args.iter();
let first = Self::try_compute(iter.next()?)?;
let (unit, mut val) = Self::length_unit_value(&first);
if !unit.is_specified_unit() {
return None;
}
for arg in iter {
let (u, v) = Self::length_unit_value(&Self::try_compute(arg)?);
if u != unit {
return None;
}
if v < val {
val = v;
}
}
Some(LengthUnit::to_length(unit, val))
}
CalcExpr::Max(args) => {
let mut iter = args.iter();
let first = Self::try_compute(iter.next()?)?;
let (unit, mut val) = Self::length_unit_value(&first);
if !unit.is_specified_unit() {
return None;
}
for arg in iter {
let (u, v) = Self::length_unit_value(&Self::try_compute(arg)?);
if u != unit {
return None;
}
if v > val {
val = v;
}
}
Some(LengthUnit::to_length(unit, val))
}
CalcExpr::Clamp(min, val, max) => {
let min = Self::try_compute(min)?;
let val = Self::try_compute(val)?;
let max = Self::try_compute(max)?;
let (u, mn) = Self::length_unit_value(&min);
let (uu, vv) = Self::length_unit_value(&val);
let (uuu, mx) = Self::length_unit_value(&max);
if u == uu && uu == uuu && u.is_specified_unit() {
Some(LengthUnit::to_length(u, vv.max(mn).min(mx)))
} else {
None
}
}
_ => None,
}
}
Expand Down Expand Up @@ -358,6 +463,52 @@ pub(crate) fn parse_calc_inner<'a, 't: 'a, 'i: 't>(
})
}

// Parse the body of a math function (min/max/clamp) whose `Function` token has already
// been consumed by the caller. `name` is matched ASCII case-insensitively.
#[inline(never)]
pub(crate) fn parse_math_function_body<'a, 't: 'a, 'i: 't>(
parser: &'a mut Parser<'i, 't>,
properties: &mut Vec<PropertyMeta>,
st: &mut ParseState,
expect_type: ExpectValueType,
name: &str,
) -> Result<CalcExpr, ParseError<'i, CustomError>> {
match name.to_ascii_lowercase().as_str() {
"min" | "max" => {
let is_min = name.eq_ignore_ascii_case("min");
let args: Vec<CalcExpr> = parser.parse_nested_block(|parser| {
parse_comma_separated_without_important(parser, |p| {
parse_calc_sum_expr(p, properties, st, expect_type)
})
})?;
let arr: Array<CalcExpr> = args.into();
Ok(if is_min {
CalcExpr::Min(arr)
} else {
CalcExpr::Max(arr)
})
}
"clamp" => {
let args: Vec<CalcExpr> = parser.parse_nested_block(|parser| {
parse_comma_separated_without_important(parser, |p| {
parse_calc_sum_expr(p, properties, st, expect_type)
})
})?;
if args.len() != 3 {
return Err(parser.new_custom_error(CustomError::Reason(
"clamp() requires exactly 3 arguments".to_string(),
)));
}
let mut it = args.into_iter();
let min = it.next().unwrap();
let val = it.next().unwrap();
let max = it.next().unwrap();
Ok(CalcExpr::Clamp(Box::new(min), Box::new(val), Box::new(max)))
}
_ => Err(parser.new_custom_error(CustomError::Unsupported)),
}
}

#[inline(never)]
fn parse_calc_sum_expr<'a, 't: 'a, 'i: 't>(
parser: &'a mut Parser<'i, 't>,
Expand Down Expand Up @@ -504,5 +655,23 @@ fn parse_calc_value<'a, 't: 'a, 'i: 't>(
return Ok(CalcExpr::Angle(Box::new(angle)));
}
}
// match min() / max() / clamp()
let func = parser.try_parse::<_, CalcExpr, ParseError<'_, CustomError>>(|parser| {
let next = parser.next()?.clone();
let name = match &next {
Token::Function(n) => n.to_string(),
_ => return Err(parser.new_unexpected_token_error(next)),
};
if !(name.eq_ignore_ascii_case("min")
|| name.eq_ignore_ascii_case("max")
|| name.eq_ignore_ascii_case("clamp"))
{
return Err(parser.new_unexpected_token_error(next));
}
parse_math_function_body(parser, properties, st, expect_type, &name)
});
if let Ok(expr) = func {
return Ok(expr);
}
Err(parser.new_custom_error(CustomError::Unmatched))
}
84 changes: 68 additions & 16 deletions float-pigment-css/src/parser/property_value/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,16 +197,17 @@ fn parse_length_inner<'a, 't: 'a, 'i: 't>(
if !allow_negative && *value < 0. {
return Err(parser.new_unexpected_token_error(next));
}
// CSS dimension units are ASCII case-insensitive.
let unit: &str = unit;
match unit {
"px" => return Ok(Length::Px(*value)),
"vw" => return Ok(Length::Vw(*value)),
"vh" => return Ok(Length::Vh(*value)),
"rem" => return Ok(Length::Rem(*value)),
"rpx" => return Ok(Length::Rpx(*value)),
"em" => return Ok(Length::Em(*value)),
"vmin" => return Ok(Length::Vmin(*value)),
"vmax" => return Ok(Length::Vmax(*value)),
u if u.eq_ignore_ascii_case("px") => return Ok(Length::Px(*value)),
u if u.eq_ignore_ascii_case("vw") => return Ok(Length::Vw(*value)),
u if u.eq_ignore_ascii_case("vh") => return Ok(Length::Vh(*value)),
u if u.eq_ignore_ascii_case("rem") => return Ok(Length::Rem(*value)),
u if u.eq_ignore_ascii_case("rpx") => return Ok(Length::Rpx(*value)),
u if u.eq_ignore_ascii_case("em") => return Ok(Length::Em(*value)),
u if u.eq_ignore_ascii_case("vmin") => return Ok(Length::Vmin(*value)),
u if u.eq_ignore_ascii_case("vmax") => return Ok(Length::Vmax(*value)),
_ => {}
}
}
Expand Down Expand Up @@ -237,6 +238,24 @@ fn parse_length_inner<'a, 't: 'a, 'i: 't>(
Length::Expr(Box::new(LengthExpr::Calc(Box::new(ret))))
});
}
n if n.eq_ignore_ascii_case("min")
|| n.eq_ignore_ascii_case("max")
|| n.eq_ignore_ascii_case("clamp") =>
{
return parse_math_function_body(
parser,
properties,
st,
ExpectValueType::NumberAndLength,
n,
)
.map(|ret| {
if let Some(r) = ComputeCalcExpr::<Length>::try_compute(&ret) {
return r;
}
Length::Expr(Box::new(LengthExpr::Calc(Box::new(ret))))
});
}
_ => {}
},
_ => {}
Expand Down Expand Up @@ -317,20 +336,21 @@ pub(crate) fn angle<'a, 't: 'a, 'i: 't>(
properties: &mut Vec<PropertyMeta>,
st: &mut ParseState,
) -> Result<Angle, ParseError<'i, CustomError>> {
let next = parser.next()?;
match next {
let next = parser.next()?.clone();
match &next {
Token::Number { value, .. } => {
if *value == 0. {
return Ok(Angle::Deg(0.));
}
}
Token::Dimension { value, unit, .. } => {
// CSS dimension units are ASCII case-insensitive.
let unit: &str = unit;
match unit {
"deg" => return Ok(Angle::Deg(*value)),
"grad" => return Ok(Angle::Grad(*value)),
"rad" => return Ok(Angle::Rad(*value)),
"turn" => return Ok(Angle::Turn(*value)),
u if u.eq_ignore_ascii_case("deg") => return Ok(Angle::Deg(*value)),
u if u.eq_ignore_ascii_case("grad") => return Ok(Angle::Grad(*value)),
u if u.eq_ignore_ascii_case("rad") => return Ok(Angle::Rad(*value)),
u if u.eq_ignore_ascii_case("turn") => return Ok(Angle::Turn(*value)),
_ => {}
}
}
Expand All @@ -344,6 +364,25 @@ pub(crate) fn angle<'a, 't: 'a, 'i: 't>(
Angle::Calc(Box::new(ret))
});
}
let n = &**name;
if n.eq_ignore_ascii_case("min")
|| n.eq_ignore_ascii_case("max")
|| n.eq_ignore_ascii_case("clamp")
{
return parse_math_function_body(
parser,
properties,
st,
ExpectValueType::AngleAndLength,
n,
)
.map(|ret| {
if let Some(r) = ComputeCalcExpr::<Angle>::try_compute(&ret) {
return r;
}
Angle::Calc(Box::new(ret))
});
}
}
_ => {}
}
Expand Down Expand Up @@ -443,8 +482,8 @@ pub(crate) fn number<'a, 't: 'a, 'i: 't>(
properties: &mut Vec<PropertyMeta>,
st: &mut ParseState,
) -> Result<Number, ParseError<'i, CustomError>> {
let next = parser.next()?;
match next {
let next = parser.next()?.clone();
match &next {
Token::Number { value, .. } => {
return Ok(Number::F32(*value));
}
Expand All @@ -459,6 +498,19 @@ pub(crate) fn number<'a, 't: 'a, 'i: 't>(
},
);
}
let n = &**name;
if n.eq_ignore_ascii_case("min")
|| n.eq_ignore_ascii_case("max")
|| n.eq_ignore_ascii_case("clamp")
{
return parse_math_function_body(parser, properties, st, ExpectValueType::Number, n)
.map(|ret| {
if let Some(r) = ComputeCalcExpr::<Number>::try_compute(&ret) {
return r;
}
Number::Calc(Box::new(ret))
});
}
}
_ => {}
}
Expand Down
Loading
Loading