mirror of
https://github.com/ilyakooo0/semi-iso-optics.git
synced 2024-09-11 07:55:36 +03:00
Merge pull request #1 from siddharthist/ghc843
Remove dependency on HList (via morphed) to fix compilation
This commit is contained in:
commit
993db9cce6
132
.travis.yml
Normal file
132
.travis.yml
Normal file
@ -0,0 +1,132 @@
|
||||
# This Travis job script has been generated by a script via
|
||||
#
|
||||
# runghc make_travis_yml_2.hs 'semi-iso.cabal'
|
||||
#
|
||||
# For more information, see https://github.com/haskell-CI/haskell-ci
|
||||
#
|
||||
language: c
|
||||
sudo: false
|
||||
|
||||
git:
|
||||
submodules: false # whether to recursively clone submodules
|
||||
|
||||
cache:
|
||||
directories:
|
||||
- $HOME/.cabal/packages
|
||||
- $HOME/.cabal/store
|
||||
|
||||
before_cache:
|
||||
- rm -fv $HOME/.cabal/packages/hackage.haskell.org/build-reports.log
|
||||
# remove files that are regenerated by 'cabal update'
|
||||
- rm -fv $HOME/.cabal/packages/hackage.haskell.org/00-index.*
|
||||
- rm -fv $HOME/.cabal/packages/hackage.haskell.org/*.json
|
||||
- rm -fv $HOME/.cabal/packages/hackage.haskell.org/01-index.cache
|
||||
- rm -fv $HOME/.cabal/packages/hackage.haskell.org/01-index.tar
|
||||
- rm -fv $HOME/.cabal/packages/hackage.haskell.org/01-index.tar.idx
|
||||
|
||||
- rm -rfv $HOME/.cabal/packages/head.hackage
|
||||
|
||||
matrix:
|
||||
include:
|
||||
- compiler: "ghc-8.6.1"
|
||||
env: GHCHEAD=true
|
||||
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.6.1], sources: [hvr-ghc]}}
|
||||
- compiler: "ghc-8.4.3"
|
||||
# env: TEST=--disable-tests BENCH=--disable-benchmarks
|
||||
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-8.4.3], sources: [hvr-ghc]}}
|
||||
- compiler: "ghc-8.2.2"
|
||||
# env: TEST=--disable-tests BENCH=--disable-benchmarks
|
||||
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-8.2.2], sources: [hvr-ghc]}}
|
||||
- compiler: "ghc-8.0.2"
|
||||
# env: TEST=--disable-tests BENCH=--disable-benchmarks
|
||||
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-8.0.2], sources: [hvr-ghc]}}
|
||||
|
||||
allow_failures:
|
||||
- compiler: "ghc-8.6.1"
|
||||
|
||||
before_install:
|
||||
- HC=${CC}
|
||||
- HCPKG=${HC/ghc/ghc-pkg}
|
||||
- unset CC
|
||||
- ROOTDIR=$(pwd)
|
||||
- mkdir -p $HOME/.local/bin
|
||||
- "PATH=/opt/ghc/bin:/opt/ghc-ppa-tools/bin:$HOME/local/bin:$PATH"
|
||||
- HCNUMVER=$(( $(${HC} --numeric-version|sed -E 's/([0-9]+)\.([0-9]+)\.([0-9]+).*/\1 * 10000 + \2 * 100 + \3/') ))
|
||||
- echo $HCNUMVER
|
||||
|
||||
install:
|
||||
- cabal --version
|
||||
- echo "$(${HC} --version) [$(${HC} --print-project-git-commit-id 2> /dev/null || echo '?')]"
|
||||
- BENCH=${BENCH---enable-benchmarks}
|
||||
- TEST=${TEST---enable-tests}
|
||||
- HADDOCK=${HADDOCK-true}
|
||||
- UNCONSTRAINED=${UNCONSTRAINED-true}
|
||||
- NOINSTALLEDCONSTRAINTS=${NOINSTALLEDCONSTRAINTS-false}
|
||||
- GHCHEAD=${GHCHEAD-false}
|
||||
- travis_retry cabal update -v
|
||||
- "sed -i.bak 's/^jobs:/-- jobs:/' ${HOME}/.cabal/config"
|
||||
- rm -fv cabal.project cabal.project.local
|
||||
# Overlay Hackage Package Index for GHC HEAD: https://github.com/hvr/head.hackage
|
||||
- |
|
||||
if $GHCHEAD; then
|
||||
sed -i 's/-- allow-newer: .*/allow-newer: *:base/' ${HOME}/.cabal/config
|
||||
for pkg in $($HCPKG list --simple-output); do pkg=$(echo $pkg | sed 's/-[^-]*$//'); sed -i "s/allow-newer: /allow-newer: *:$pkg, /" ${HOME}/.cabal/config; done
|
||||
|
||||
echo 'repository head.hackage' >> ${HOME}/.cabal/config
|
||||
echo ' url: http://head.hackage.haskell.org/' >> ${HOME}/.cabal/config
|
||||
echo ' secure: True' >> ${HOME}/.cabal/config
|
||||
echo ' root-keys: 07c59cb65787dedfaef5bd5f987ceb5f7e5ebf88b904bbd4c5cbdeb2ff71b740' >> ${HOME}/.cabal/config
|
||||
echo ' 2e8555dde16ebd8df076f1a8ef13b8f14c66bad8eafefd7d9e37d0ed711821fb' >> ${HOME}/.cabal/config
|
||||
echo ' 8f79fd2389ab2967354407ec852cbe73f2e8635793ac446d09461ffb99527f6e' >> ${HOME}/.cabal/config
|
||||
echo ' key-threshold: 3' >> ${HOME}/.cabal.config
|
||||
|
||||
grep -Ev -- '^\s*--' ${HOME}/.cabal/config | grep -Ev '^\s*$'
|
||||
|
||||
cabal new-update head.hackage -v
|
||||
fi
|
||||
- grep -Ev -- '^\s*--' ${HOME}/.cabal/config | grep -Ev '^\s*$'
|
||||
- "printf 'packages: \".\"\\n' > cabal.project"
|
||||
- touch cabal.project.local
|
||||
- "if ! $NOINSTALLEDCONSTRAINTS; then for pkg in $($HCPKG list --simple-output); do echo $pkg | grep -vw -- semi-iso | sed 's/^/constraints: /' | sed 's/-[^-]*$/ installed/' >> cabal.project.local; done; fi"
|
||||
- cat cabal.project || true
|
||||
- cat cabal.project.local || true
|
||||
- if [ -f "./configure.ac" ]; then
|
||||
(cd "." && autoreconf -i);
|
||||
fi
|
||||
- rm -f cabal.project.freeze
|
||||
- cabal new-build -w ${HC} ${TEST} ${BENCH} --project-file="cabal.project" --dep -j2 all
|
||||
- cabal new-build -w ${HC} --disable-tests --disable-benchmarks --project-file="cabal.project" --dep -j2 all
|
||||
- rm -rf .ghc.environment.* "."/dist
|
||||
- DISTDIR=$(mktemp -d /tmp/dist-test.XXXX)
|
||||
|
||||
# Here starts the actual work to be performed for the package under test;
|
||||
# any command which exits with a non-zero exit code causes the build to fail.
|
||||
script:
|
||||
# test that source-distributions can be generated
|
||||
- (cd "." && cabal sdist)
|
||||
- mv "."/dist/semi-iso-*.tar.gz ${DISTDIR}/
|
||||
- cd ${DISTDIR} || false
|
||||
- find . -maxdepth 1 -name '*.tar.gz' -exec tar -xvf '{}' \;
|
||||
- "printf 'packages: semi-iso-*/*.cabal\\n' > cabal.project"
|
||||
- touch cabal.project.local
|
||||
- "if ! $NOINSTALLEDCONSTRAINTS; then for pkg in $($HCPKG list --simple-output); do echo $pkg | grep -vw -- semi-iso | sed 's/^/constraints: /' | sed 's/-[^-]*$/ installed/' >> cabal.project.local; done; fi"
|
||||
- cat cabal.project || true
|
||||
- cat cabal.project.local || true
|
||||
# this builds all libraries and executables (without tests/benchmarks)
|
||||
- cabal new-build -w ${HC} --disable-tests --disable-benchmarks all
|
||||
|
||||
# build & run tests, build benchmarks
|
||||
- cabal new-build -w ${HC} ${TEST} ${BENCH} all
|
||||
|
||||
# cabal check
|
||||
- (cd semi-iso-* && cabal check)
|
||||
|
||||
# haddock
|
||||
- rm -rf ./dist-newstyle
|
||||
- if $HADDOCK; then cabal new-haddock -w ${HC} ${TEST} ${BENCH} all; else echo "Skipping haddock generation";fi
|
||||
|
||||
# Build without installed constraints for packages in global-db
|
||||
- if $UNCONSTRAINED; then rm -f cabal.project.local; echo cabal new-build -w ${HC} --disable-tests --disable-benchmarks all; else echo "Not building without installed constraints"; fi
|
||||
|
||||
# REGENDATA ["semi-iso.cabal"]
|
||||
# EOF
|
@ -64,7 +64,6 @@ module Control.Lens.SemiIso (
|
||||
unit,
|
||||
swapped,
|
||||
associated,
|
||||
morphed,
|
||||
constant,
|
||||
exact,
|
||||
bifiltered,
|
||||
@ -106,7 +105,6 @@ import Data.Foldable
|
||||
import Data.Functor.Identity
|
||||
import Data.Profunctor.Exposed
|
||||
import Data.Traversable
|
||||
import Data.Tuple.Morph
|
||||
import Prelude hiding (id, (.))
|
||||
|
||||
-- | A semi-isomorphism is a partial isomorphism with weakened laws.
|
||||
@ -222,14 +220,6 @@ unit = iso (, ()) fst
|
||||
associated :: Iso' (a, (b, c)) ((a, b), c)
|
||||
associated = iso (\(a, (b, c)) -> ((a, b), c)) (\((a, b), c) -> (a, (b, c)))
|
||||
|
||||
-- | An isomorphism between two arbitrary nested tuples, as long the contained
|
||||
-- types (ignoring units!) read from left to right are the same.
|
||||
--
|
||||
-- This is implemented using 'Data.Tuple.Morph.morph' from 'tuple-morph'.
|
||||
morphed :: (HFoldable a, HUnfoldable a, HFoldable b, HUnfoldable b, Rep a ~ Rep b)
|
||||
=> Iso' a b
|
||||
morphed = iso morph morph
|
||||
|
||||
-- | \-> Always returns the argument.
|
||||
--
|
||||
-- \<- Maps everything to a @()@.
|
||||
|
@ -21,8 +21,7 @@ module Control.SIArrow (
|
||||
(#>>), (>>#), (#<<), (<<#),
|
||||
|
||||
-- * Functor and applicative.
|
||||
(/$/), (/$~),
|
||||
(/*/), (/*), (*/),
|
||||
(/$/), (/*/), (/*), (*/),
|
||||
|
||||
-- * Signaling errors.
|
||||
sifail, (/?/),
|
||||
@ -43,12 +42,11 @@ import Control.Lens.Iso
|
||||
import Control.Lens.SemiIso
|
||||
import Control.Monad
|
||||
import Data.Semigroupoid.Dual
|
||||
import Data.Tuple.Morph
|
||||
import Prelude hiding (id, (.))
|
||||
|
||||
infixr 1 ^>>, ^<<, #>>, #<<
|
||||
infixr 1 >>^, <<^, >>#, <<#
|
||||
infixl 4 /$/, /$~
|
||||
infixl 4 /$/
|
||||
infixl 5 /*/, */, /*
|
||||
infixl 3 /?/
|
||||
|
||||
@ -143,19 +141,6 @@ a <<# f = a . sipure f
|
||||
(/$/) :: SIArrow cat => ASemiIso' b' b -> cat a b -> cat a b'
|
||||
(/$/) = (#<<)
|
||||
|
||||
-- | Convenient fmap.
|
||||
--
|
||||
-- > ai /$~ f = ai . morphed /$/ f
|
||||
--
|
||||
-- This operator handles all the hairy stuff with uncurried application:
|
||||
-- it reassociates the argument tuple and removes unnecessary (or adds necessary)
|
||||
-- units to match the function type. You don't have to use @/*@ and @*/@ with this
|
||||
-- operator.
|
||||
(/$~) :: (SIArrow cat, HFoldable b', HFoldable b,
|
||||
HUnfoldable b', HUnfoldable b, Rep b' ~ Rep b)
|
||||
=> ASemiIso' a b' -> cat c b -> cat c a
|
||||
ai /$~ h = cloneSemiIso ai . morphed /$/ h
|
||||
|
||||
-- | The product of two arrows with duplicate units removed. Side effect are
|
||||
-- sequenced from left to right.
|
||||
--
|
||||
|
@ -53,7 +53,8 @@ maintainer: Paweł Nowak <pawel834@gmail.com>
|
||||
copyright: Paweł Nowak 2014
|
||||
category: Control, Data
|
||||
build-type: Simple
|
||||
cabal-version: >=1.10
|
||||
cabal-version: >=1.11
|
||||
Tested-with: GHC==8.0.2, GHC==8.2.2, GHC==8.4.3, GHC==8.6.1
|
||||
|
||||
source-repository head
|
||||
type: git
|
||||
@ -66,6 +67,10 @@ library
|
||||
Control.Category.Reader
|
||||
Control.Category.Structures
|
||||
Data.Profunctor.Exposed
|
||||
build-depends: base >= 4 && < 5, profunctors, transformers, lens, tuple-morph, semigroupoids
|
||||
build-depends: base >= 4.9 && <4.13
|
||||
, profunctors == 5.*
|
||||
, transformers
|
||||
, lens == 4.*
|
||||
, semigroupoids
|
||||
default-language: Haskell2010
|
||||
ghc-options: -Wall
|
||||
|
Loading…
Reference in New Issue
Block a user