From 0037450c8abf7f345d0d2a17ab92e8bde533d59d Mon Sep 17 00:00:00 2001
From: sharkdp <davidpeter@web.de>
Date: Sun, 3 Apr 2016 14:46:59 +0200
Subject: [PATCH] Add tests and fix enumFromTo, closes #15

---
 .travis.yml              |  1 +
 bower.json               |  4 +++
 package.json             |  3 +-
 src/Data/Enum.purs       | 15 ++++++----
 test/Main.purs           | 12 ++++++++
 test/Test/Data/Enum.purs | 65 ++++++++++++++++++++++++++++++++++++++++
 6 files changed, 94 insertions(+), 6 deletions(-)
 create mode 100644 test/Main.purs
 create mode 100644 test/Test/Data/Enum.purs

diff --git a/.travis.yml b/.travis.yml
index f9843c2..c33fb6f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,6 +14,7 @@ install:
   - bower install
 script:
   - npm run -s build
+  - npm test
 after_success:
 - >-
   test $TRAVIS_TAG &&
diff --git a/bower.json b/bower.json
index 6fda6c7..1e5b512 100644
--- a/bower.json
+++ b/bower.json
@@ -21,5 +21,9 @@
     "purescript-either": "^1.0.0-rc.1",
     "purescript-strings": "^1.0.0-rc.1",
     "purescript-unfoldable": "^1.0.0-rc.1"
+  },
+  "devDependencies": {
+    "purescript-assert": "^1.0.0-rc.1",
+    "purescript-console": "^1.0.0-rc.1"
   }
 }
diff --git a/package.json b/package.json
index 83e0ba0..16567a0 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,8 @@
   "private": true,
   "scripts": {
     "clean": "rimraf output && rimraf .pulp-cache",
-    "build": "pulp build --censor-lib --strict"
+    "build": "pulp build --censor-lib --strict",
+    "test": "pulp test"
   },
   "devDependencies": {
     "pulp": "^8.2.0",
diff --git a/src/Data/Enum.purs b/src/Data/Enum.purs
index cf18a30..d1feac3 100644
--- a/src/Data/Enum.purs
+++ b/src/Data/Enum.purs
@@ -15,6 +15,8 @@ module Data.Enum
 
 import Prelude
 
+import Control.MonadPlus (guard)
+
 import Data.Char (fromCharCode, toCharCode)
 import Data.Either (Either(..))
 import Data.Maybe (Maybe(..), maybe, fromJust)
@@ -93,12 +95,15 @@ defaultSucc toEnum' fromEnum' a = toEnum' (fromEnum' a + 1)
 defaultPred :: forall a. (Int -> Maybe a) -> (a -> Int) -> a -> Maybe a
 defaultPred toEnum' fromEnum' a = toEnum' (fromEnum' a - 1)
 
--- | Property: ```fromEnum a = a', fromEnum b = b' => forall e', a' <= e' <= b': Exists e: toEnum e' = Just e```
--- |
--- | Following from the propery of `intFromTo`, we are sure all elements in `intFromTo (fromEnum a) (fromEnum b)` are `Just`s.
--- TODO need to update the doc comment above
+-- | Returns a successive sequence of elements from the lower bound to
+-- | the upper bound (inclusive).
 enumFromTo :: forall a u. (Enum a, Unfoldable u) => a -> a -> u a
-enumFromTo from to = unfoldr (\x -> succ x >>= \x' -> if x <= to then pure $ Tuple x x' else Nothing) from
+enumFromTo from to = unfoldr go (Just from)
+  where
+    go mx = do
+      x <- mx
+      guard (x <= to)
+      pure $ Tuple x (succ x)
 
 -- | `[a,b..c]`
 enumFromThenTo :: forall a. BoundedEnum a => a -> a -> a -> Array a
diff --git a/test/Main.purs b/test/Main.purs
new file mode 100644
index 0000000..f3eb9ec
--- /dev/null
+++ b/test/Main.purs
@@ -0,0 +1,12 @@
+module Test.Main where
+
+import Prelude
+
+import Control.Monad.Eff (Eff)
+import Control.Monad.Eff.Console (CONSOLE)
+
+import Test.Assert (ASSERT)
+import Test.Data.Enum (testEnum)
+
+main :: Eff (console :: CONSOLE, assert :: ASSERT) Unit
+main = testEnum
diff --git a/test/Test/Data/Enum.purs b/test/Test/Data/Enum.purs
new file mode 100644
index 0000000..c57b50f
--- /dev/null
+++ b/test/Test/Data/Enum.purs
@@ -0,0 +1,65 @@
+module Test.Data.Enum (testEnum) where
+
+import Prelude
+
+import Control.Monad.Eff (Eff)
+import Control.Monad.Eff.Console (CONSOLE, log)
+
+import Data.Enum (class Enum, class BoundedEnum, defaultToEnum, defaultFromEnum,
+                  defaultCardinality, enumFromTo, enumFromThenTo, upFrom,
+                  downFrom)
+import Data.Maybe (Maybe(..))
+
+import Test.Assert (ASSERT, assert)
+
+data T = A | B | C | D | E
+
+derive instance eqT  :: Eq  T
+derive instance ordT :: Ord T
+
+instance enumT :: Enum T where
+  succ A = Just B
+  succ B = Just C
+  succ C = Just D
+  succ D = Just E
+  succ E = Nothing
+
+  pred A = Nothing
+  pred B = Just A
+  pred C = Just B
+  pred D = Just C
+  pred E = Just D
+
+instance boundedT :: Bounded T where
+  bottom = A
+  top = E
+
+instance boundedEnumT :: BoundedEnum T where
+  cardinality = defaultCardinality
+  toEnum = defaultToEnum
+  fromEnum = defaultFromEnum
+
+testEnum :: Eff (console :: CONSOLE, assert :: ASSERT) Unit
+testEnum = do
+  log "enumFromTo"
+  assert $ enumFromTo A A == [A]
+  assert $ enumFromTo B A == []
+  assert $ enumFromTo A C == [A, B, C]
+  assert $ enumFromTo A E == [A, B, C, D, E]
+
+  log "enumFromThenTo"
+  assert $ enumFromThenTo A B E == [A, B, C, D, E]
+  assert $ enumFromThenTo A C E == [A,    C,    E]
+  assert $ enumFromThenTo A E E == [A,          E]
+  assert $ enumFromThenTo A C C == [A,    C      ]
+  assert $ enumFromThenTo A C D == [A,    C      ]
+
+  log "upFrom"
+  assert $ upFrom B == [C, D, E]
+  assert $ upFrom D == [      E]
+  assert $ upFrom E == [       ]
+
+  log "downFrom"
+  assert $ downFrom D == [C, B, A]
+  assert $ downFrom B == [      A]
+  assert $ downFrom A == [       ]