Error out for undefined variables
This commit is contained in:
parent
16aca9a66b
commit
9e7ad28c5c
2 changed files with 17 additions and 8 deletions
18
src/Lib.hs
18
src/Lib.hs
|
@ -1,5 +1,5 @@
|
|||
module Lib
|
||||
( exprparser, evaluate, replaceVars
|
||||
( exprparser, evaluate, replaceVars, Expr
|
||||
) where
|
||||
import Control.Applicative((<*))
|
||||
|
||||
|
@ -92,10 +92,17 @@ term = m_parens exprparser
|
|||
<|> fmap Constant constantInteger
|
||||
<|> fmap Constant constantRational
|
||||
|
||||
replaceVars :: Expr -> Map.Map String Rational -> Expr
|
||||
replaceVars (Variable name) vs = Constant . maybe (0 % 1) id $ Map.lookup name vs
|
||||
replaceVars (Binary op a b) vs = Binary op (replaceVars a vs) (replaceVars b vs)
|
||||
replaceVars (Constant c) vs = Constant c
|
||||
replaceVars :: Expr -> Map.Map String Rational -> Either String Expr
|
||||
replaceVars (Constant c) vs = Right $ Constant c
|
||||
replaceVars (Variable name) vs = maybe (Left ("Usage of unknown variable: '" ++ name ++ "'\nSuggestion: define the variable\n++ " ++ name ++ "=42")) (Right . Constant . id) $ Map.lookup name vs
|
||||
replaceVars (Binary op l r) vs = case leftBranch of
|
||||
Left s -> Left s
|
||||
Right a -> case rightBranch of
|
||||
Left s -> Left s
|
||||
Right b -> Right $ Binary op a b
|
||||
where
|
||||
leftBranch = replaceVars l vs
|
||||
rightBranch = replaceVars r vs
|
||||
|
||||
evaluate :: Expr -> Rational
|
||||
evaluate (Constant c) = c
|
||||
|
@ -104,3 +111,4 @@ evaluate (Binary Minus a b) = evaluate a - evaluate b
|
|||
evaluate (Binary Divide a b) = evaluate a / evaluate b
|
||||
evaluate (Binary Multiply a b) = evaluate a * evaluate b
|
||||
evaluate (Binary Power a b) = rationalPower (evaluate a) (evaluate b)
|
||||
evaluate (Variable _) = error "Unreachable Code"
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue