haskell-nix/hnix
1
1
Fork 0
mirror of https://github.com/haskell-nix/hnix.git synced 2024-10-26 08:32:17 +03:00
Code Issues Projects Releases Wiki Activity

Less than test (#461)

Browse Source 
References issue #438 

Co-authored-by: John Wiegley <johnw@newartisans.com>
This commit is contained in:
Emmanuel Denloye-Ito 2019-03-10 14:16:36 -04:00 committed by John Wiegley
parent 602b71c173
commit 586f1de62d
3 changed files with 47 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -10,4 +10,5 @@ TAGS
cabal.project*
ctags
dist-newstyle
result
result*
.ghc.environment.*

2
src/Nix/Builtins.hs
View File

@ -895,7 +895,7 @@ lessThan ta tb = ta >>= \va -> tb >>= \vb -> do
(NInt a, NFloat b) -> pure $ fromInteger a < b
(NFloat a, NFloat b) -> pure $ a < b
_ -> badType
(NVStr a, NVStr b) -> pure $ hackyStringIgnoreContext a < hackyStringIgnoreContext b
(NVStr a, NVStr b) -> pure $ principledStringIgnoreContext a < principledStringIgnoreContext b
_ -> badType
concatLists :: forall e m. MonadNix e m => m (NValue m) -> m (NValue m)

44
tests/eval-compare/builtins.lessThan-01.nix Normal file
View File

@ -0,0 +1,44 @@
with builtins;
let numTestPrecisionA = 4.000000000000000000001;
numTestPrecisionB = 4;
numTest3 = -4.1;
numTest4 = -4;
numTestZeroA = 0;
numTestZeroB = -0;
numTestMaxBoundA = 999999999999999999;
numTestMaxBoundB = 999999999999999998;
numTestMinBoundA = -999999999999999999;
numTestMinBoundB = -999999999999999998;
stringTest1 = "abcd";
stringTest2 = "abce";
stringTestBase1 = "foo" + "/" + stringTest1;
stringTestBase2 = "foo" + "/" + stringTest2;
stringTestJSONA = toJSON stringTest1;
stringTestJSONB = toJSON stringTest2;
stringTestToFileA = toFile "stringTest1" stringTest1;
stringTestToFileB = toFile "stringTest2" stringTest2;
in [(lessThan numTestPrecisionA numTestPrecisionB)
(lessThan numTestPrecisionB numTestPrecisionA)
(lessThan numTest3 numTest4)
(lessThan numTest4 numTest3)
(lessThan numTestZeroA numTestZeroB)
(lessThan numTestZeroB numTestZeroA)
(lessThan numTestMaxBoundA numTestMaxBoundB)
(lessThan numTestMaxBoundB numTestMaxBoundA)
(lessThan numTestMinBoundA numTestMinBoundB)
(lessThan numTestMinBoundB numTestMinBoundA)
(lessThan stringTest1 stringTest2)
(lessThan stringTest2 stringTest1)
(lessThan stringTestJSONA stringTestJSONB)
(lessThan stringTestJSONB stringTestJSONA)
(lessThan stringTest1 stringTestJSONB)
(lessThan stringTestJSONB stringTest1)
(lessThan stringTest2 stringTestJSONA)
(lessThan stringTestJSONA stringTest2)
(lessThan stringTest1 stringTestToFileB)
(lessThan stringTestToFileB stringTest1)
(lessThan stringTestToFileA stringTest2)
(lessThan stringTest1 (baseNameOf stringTestBase1))
(lessThan stringTest2 (baseNameOf stringTestBase2))
]