From 92c01da36016e94ff20163806ddcbcf7e33d4031 Mon Sep 17 00:00:00 2001 From: Laurenz Date: Sat, 10 Oct 2020 22:19:36 +0200 Subject: =?UTF-8?q?Switch=20back=20to=20custom=20geometry=20types,=20unifi?= =?UTF-8?q?ed=20with=20layout=20primitives=20=F0=9F=8F=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/syntax/token.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/syntax/token.rs') diff --git a/src/syntax/token.rs b/src/syntax/token.rs index cb0526c1..5b055e39 100644 --- a/src/syntax/token.rs +++ b/src/syntax/token.rs @@ -1,6 +1,6 @@ //! Token definition. -use crate::length::Length; +use crate::geom::Unit; /// A minimal semantic entity of source code. #[derive(Debug, Copy, Clone, PartialEq)] @@ -72,10 +72,10 @@ pub enum Token<'s> { /// A floating-point number: `1.2`, `10e-4`. Float(f64), /// A length: `12pt`, `3cm`. - Length(Length), + Length(f64, Unit), /// A percentage: `50%`. /// - /// _Note_: `50%` is represented as `50.0` here, as in the corresponding + /// _Note_: `50%` is stored as `50.0` here, as in the corresponding /// [literal]. /// /// [literal]: ../ast/enum.Lit.html#variant.Percent @@ -159,7 +159,7 @@ impl<'s> Token<'s> { Self::Bool(_) => "bool", Self::Int(_) => "integer", Self::Float(_) => "float", - Self::Length(_) => "length", + Self::Length(..) => "length", Self::Percent(_) => "percentage", Self::Hex(_) => "hex value", Self::Str { .. } => "string", -- cgit v1.2.3