aboutsummaryrefslogtreecommitdiffstats
path: root/RealCalc.hs
diff options
context:
space:
mode:
Diffstat (limited to 'RealCalc.hs')
-rw-r--r--RealCalc.hs6
1 files changed, 6 insertions, 0 deletions
diff --git a/RealCalc.hs b/RealCalc.hs
index 11eebe4..df2e06d 100644
--- a/RealCalc.hs
+++ b/RealCalc.hs
@@ -54,6 +54,12 @@ simplify (Expr.Times e1 e2) =
genericCombine (*) (simplify e1) (simplify e2)
simplify (Expr.Div e1 e2) =
RFloat (rToDouble (simplify e1) / rToDouble (simplify e2))
+simplify (Expr.Pow e1 e2) =
+ case (simplify e1, simplify e2) of
+ (RInt a, RInt b)
+ | b >= 0 -> RInt (a ^ b)
+ (a, RInt b) -> RFloat (rToDouble a ^^ b)
+ (a, RFloat b) -> RFloat (rToDouble a ** b)
simplify (Expr.EInt i) = RInt i
simplify (Expr.EFloat d) = RFloat d
simplify Expr.E = RFloat (exp 1)