picnoir/hnix
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Builtins.div cannot divide by 0

Browse source 
Fixes #277.
This commit is contained in:
Félix Baylac-Jacqué 2018-06-12 21:49:55 +02:00
parent 2828d32144
commit d3cbcf791c
No known key found for this signature in database
GPG key ID: EFD315F31848DBA4
2 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/Nix/Builtins.hs
View file

@ -356,11 +356,14 @@ mul_ x y = x >>= \x' -> y >>= \y' -> case (x', y') of
div_ :: MonadNix e m => m (NValue m) -> m (NValue m) -> m (NValue m)
div_ x y = x >>= \x' -> y >>= \y' -> case (x', y') of
(NVConstant (NInt x), NVConstant (NInt y)) ->
(NVConstant (NInt x), NVConstant (NInt y)) | y /= 0 ->
toNix (floor (fromInteger x / fromInteger y :: Double) :: Integer)
(NVConstant (NFloat x), NVConstant (NInt y)) -> toNix (x / fromInteger y)
(NVConstant (NInt x), NVConstant (NFloat y)) -> toNix (fromInteger x / y)
(NVConstant (NFloat x), NVConstant (NFloat y)) -> toNix (x / y)
(NVConstant (NFloat x), NVConstant (NInt y)) | y /= 0 ->
toNix (x / fromInteger y)
(NVConstant (NInt x), NVConstant (NFloat y)) | y /= 0 ->
toNix (fromInteger x / y)
(NVConstant (NFloat x), NVConstant (NFloat y)) | y /= 0 ->
toNix (x / y)
(_, _) ->
throwError $ Division x' y'

6
tests/EvalTests.hs
View file

@ -31,6 +31,12 @@ case_basic_sum =
case_basic_div =
constantEqualText "3" "builtins.div 6 2"
case_zero_div = do
assertNixEvalThrows "builtins.div 1 0"
assertNixEvalThrows "builtins.div 1.0 0"
assertNixEvalThrows "builtins.div 1 0.0"
assertNixEvalThrows "builtins.div 1.0 0.0"
case_basic_function =
constantEqualText "2" "(a: a) 2"