Sitelet https://github.com/purescript/purescript-functors/pull/16/files
Skip to content

Fix Eq / Eq1 instances for compose #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
garyb merged 1 commit into from
Jun 28, 2018
Merged

Fix Eq / Eq1 instances for compose #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,11 @@ install:
- chmod a+x $HOME/purescript
- npm install -g bower
- npm install
- bower install
- bower install --production
script:
- npm run -s build
- bower install
- npm run -s test
after_success:
- >-
test $TRAVIS_TAG &&
Expand Down
3 changes: 3 additions & 0 deletions bower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,8 @@
"purescript-prelude": "^4.0.0",
"purescript-tuples": "^5.0.0",
"purescript-unsafe-coerce": "^4.0.0"
},
"devDependencies": {
"purescript-assert": "^4.0.0"
}
}
14 changes: 7 additions & 7 deletions src/Data/Functor/Compose.purs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,17 +27,17 @@ bihoistCompose natF natG (Compose fga) = Compose (natF (map natG fga))

derive instance newtypeCompose :: Newtype (Compose f g a) _

derive instance eq1Compose :: (Eq1 f, Eq1 g) => Eq1 (Compose f g)

instance eqCompose :: (Eq1 f, Eq1 g, Eq a) => Eq (Compose f g a) where
eq = eq1
eq (Compose fga1) (Compose fga2) =
eq1 (hoistLiftApp fga1) (hoistLiftApp fga2)

instance ord1Compose :: (Ord1 f, Ord1 g) => Ord1 (Compose f g) where
compare1 (Compose fga1) (Compose fga2) =
compare1 (hoistLiftApp fga1) (hoistLiftApp fga2)
derive instance eq1Compose :: (Eq1 f, Eq1 g) => Eq1 (Compose f g)

instance ordCompose :: (Ord1 f, Ord1 g, Ord a) => Ord (Compose f g a) where
compare = compare1
compare (Compose fga1) (Compose fga2) =
compare1 (hoistLiftApp fga1) (hoistLiftApp fga2)

derive instance ord1Compose :: (Ord1 f, Ord1 g) => Ord1 (Compose f g)

instance showCompose :: Show (f (g a)) => Show (Compose f g a) where
show (Compose fga) = "(Compose " <> show fga <> ")"
Expand Down
20 changes: 20 additions & 0 deletions test/Main.purs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
module Test.Main where

import Prelude

import Data.Functor.Compose (Compose(..))
import Data.Identity (Identity(..))
import Data.Maybe (Maybe(..))
import Effect (Effect)
import Test.Assert (assertEqual)

main :: Effect Unit
main = do
assertEqual
{ expected: Compose (Identity (Just true))
, actual: Compose (Identity (Just true))
}
assertEqual
{ expected: Compose (Identity (Just true)) > Compose (Identity (Just false))
, actual: true
}