caisin/typst
1
0
Fork 0
mirror of https://github.com/typst/typst synced 2025-05-14 04:56:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

Unify ops match arms (#3720)

Browse Source
This commit is contained in:
Matt Fellenz 2024-03-19 02:37:30 -07:00 committed by GitHub
parent c125125080
commit 41db766b83
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
crates/typst/src/eval/ops.rs
View File

@ -498,16 +498,16 @@ pub fn equal(lhs: &Value, rhs: &Value) -> bool {
(Dyn(a), Dyn(b)) => a == b,
// Some technically different things should compare equal.
(&Int(a), &Float(b)) => a as f64 == b,
(&Float(a), &Int(b)) => a == b as f64,
(&Length(a), &Relative(b)) => a == b.abs && b.rel.is_zero(),
(&Ratio(a), &Relative(b)) => a == b.rel && b.abs.is_zero(),
(&Relative(a), &Length(b)) => a.abs == b && a.rel.is_zero(),
(&Relative(a), &Ratio(b)) => a.rel == b && a.abs.is_zero(),
(&Int(i), &Float(f)) | (&Float(f), &Int(i)) => i as f64 == f,
(&Length(len), &Relative(rel)) | (&Relative(rel), &Length(len)) => {
len == rel.abs && rel.rel.is_zero()
}
(&Ratio(rat), &Relative(rel)) | (&Relative(rel), &Ratio(rat)) => {
rat == rel.rel && rel.abs.is_zero()
}
// Type compatibility.
(Type(a), Str(b)) => a.compat_name() == b.as_str(),
(Str(a), Type(b)) => a.as_str() == b.compat_name(),
(Type(ty), Str(str)) | (Str(str), Type(ty)) => ty.compat_name() == str.as_str(),
_ => false,
}