diff options
| author | Laurenz <laurmaedje@gmail.com> | 2022-10-28 16:43:38 +0200 |
|---|---|---|
| committer | Laurenz <laurmaedje@gmail.com> | 2022-10-28 16:43:38 +0200 |
| commit | 95e9134a3c7d7a14d8c8928413fdffc665671895 (patch) | |
| tree | 822b5f6c2d23aba33cfe4d199405e493e37c3d70 /src/model/eval.rs | |
| parent | 66030ae5d73d85a0463562230b87f8ec7554c746 (diff) | |
Refactor `geom` module
Diffstat (limited to 'src/model/eval.rs')
| -rw-r--r-- | src/model/eval.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/model/eval.rs b/src/model/eval.rs index 6658e244..c16156cd 100644 --- a/src/model/eval.rs +++ b/src/model/eval.rs @@ -11,7 +11,7 @@ use super::{ Pattern, Recipe, Scope, Scopes, StyleEntry, StyleMap, Value, Vm, }; use crate::diag::{At, SourceResult, StrResult, Trace, Tracepoint}; -use crate::geom::{Angle, Em, Fraction, Length, Ratio}; +use crate::geom::{Abs, Angle, Em, Fr, Ratio}; use crate::library; use crate::syntax::ast::TypedNode; use crate::syntax::{ast, SourceId, Span, Spanned, Unit}; @@ -465,10 +465,10 @@ impl Eval for ast::Lit { ast::LitKind::Int(v) => Value::Int(v), ast::LitKind::Float(v) => Value::Float(v), ast::LitKind::Numeric(v, unit) => match unit { - Unit::Length(unit) => Length::with_unit(v, unit).into(), + Unit::Length(unit) => Abs::with_unit(v, unit).into(), Unit::Angle(unit) => Angle::with_unit(v, unit).into(), Unit::Em => Em::new(v).into(), - Unit::Fr => Fraction::new(v).into(), + Unit::Fr => Fr::new(v).into(), Unit::Percent => Ratio::new(v / 100.0).into(), }, ast::LitKind::Str(v) => Value::Str(v.into()), |
