From aa17d3dc0eac3f9ea75c8b1a03754db27287d083 Mon Sep 17 00:00:00 2001 From: Adrian Cochrane Date: Sat, 14 Nov 2020 15:50:19 +1300 Subject: [PATCH] Treat ratios as fractional numbers. I'm having trouble consulting the spec, but judging by sample CSS this looks right. --- src/Data/CSS/Preprocessor/Conditions/Expr.hs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Data/CSS/Preprocessor/Conditions/Expr.hs b/src/Data/CSS/Preprocessor/Conditions/Expr.hs index c39d961..3b63a9f 100644 --- a/src/Data/CSS/Preprocessor/Conditions/Expr.hs +++ b/src/Data/CSS/Preprocessor/Conditions/Expr.hs @@ -72,7 +72,7 @@ pushOp toks op b ops = parse' toks ((op, b):ops) ---- Shunting Yard Evaluator -------- -- | Dynamic types for evaluating media queries. -data Datum = B Bool | N Float | R {minv :: Float, maxv :: Float} | Ratio Float Float deriving Eq +data Datum = B Bool | N Float | R {minv :: Float, maxv :: Float} deriving Eq -- | Evaluates a media query with the given functions for evaluating vars & tokens. eval :: (Text -> Datum) -> (Token -> Datum) -> Expr -> Bool @@ -87,7 +87,7 @@ eval' stack v t (Var name:ops) = eval' (v name:stack) v t ops eval' stack v t (Tok tok:ops) | t tok /= B False = eval' (t tok:stack) v t ops eval' stack v t (Tok (Ident name):ops) = eval' (v name:stack) v t ops -- TODO: How should I handle ratios? -eval' (N y:N x:stack) v t (MkRatio:ops) = eval' (Ratio x y:stack) v t ops +eval' (N y:N x:stack) v t (MkRatio:ops) = eval' (N (x / y):stack) v t ops eval' (N y:N x:stack) v t (Less:ops) = eval' (B (x < y):stack) v t ops eval' (R _ y:N x:stack) v t (Less:ops) = eval' (B (x < y):stack) v t ops eval' (N y: R x _:stack) v t (Less:ops) = eval' (B (x < y):stack) v t ops @@ -98,7 +98,7 @@ eval' (N y: R x _:stack) v t (LessEq:ops) = eval' (B (x <= y):stack) v t ops eval' (R _ y:R x _:stack) v t (LessEq:ops) = eval' (B (x <= y):stack) v t ops eval' (R yMin yMax:R xMin xMax:stack) v t (Equal:ops) = eval' (B (xMax >= yMin && xMin <= yMax) : stack) v t ops -eval' (y:x:stack) v t (Equal:ops) = eval' (B (x == y):stack) v t ops +eval' (N y: N x:stack) v t (Equal:ops) = eval' (B (x == y):stack) v t ops eval' (N y:N x:stack) v t (Greater:ops) = eval' (B (x > y):stack) v t ops eval' (R y _:N x:stack) v t (Greater:ops) = eval' (B (x > y):stack) v t ops eval' (N y:R _ x:stack) v t (Greater:ops) = eval' (B (x > y):stack) v t ops -- 2.30.2