on master help sign in
8 files changed+88−13
since splitsnapshots
unifiedsplit
.gitignore+1 CHANGELOG.md+15 example/Main.hs+1 src/TypeFun/Data/List.hs+24 src/TypeFun/Data/Peano.hs+14−3 stack.yaml+9 stack.yaml.lock+12 type-fun.cabal+12−10
.gitignore+1
@@ -2,3 +2,4 @@ dist
22TAGS
33.cabal-sandbox
44cabal.sandbox.config
5+.stack-work
CHANGELOG.md+15
@@ -4,5 +4,20 @@
44
55# CHANGELOG
66
7+## 0.1.2
8+### Added KnownPeano
9+
10+## 0.1.1
11+### Fixed
12+* Compilable with ghc-8.0.1
13+
14+## 0.1.0
15+### Added
16+* Type family `Substract` to remove elements of one list from another
17+* Unsafe helper functions to relax constraints in some safe points. But we use
18+ `unsafeCoerce` so this functions are potentially just break constants
19+### Changed
20+* Compilable under ghc-7.8
21+
722## 0.0.1
823First version
example/Main.hs+1
@@ -37,4 +37,5 @@ main = do
3737 print $ prefixConstr p2
3838 print $ prefixConstr p3
3939 print $ uniqConstr p2
40+ print $ peanoVal (Proxy :: Proxy (FromNat 100))
4041 -- print $ uniqConstr p3 -- < ElementIsNotUniqInList Int '[Int, Bool, Int]
src/TypeFun/Data/List.hs+24
@@ -35,10 +35,14 @@ module TypeFun.Data.List
3535 , UnionList
3636 , AppendUniq
3737 , Intersect
38+ , Substract
3839 -- * Uniqueness checking
3940 , ElementIsUniq
4041 , UniqElements
4142 , UniqElements'
43+ -- * Unsafe helpers
44+ , appendId
45+ , subListId
4246 ) where
4347
4448import Data.Type.Bool
@@ -47,6 +51,7 @@ import GHC.TypeLits
4751import TypeFun.Data.Eq
4852import TypeFun.Data.Maybe
4953import TypeFun.Data.Peano
54+import Unsafe.Coerce
5055
5156------------------------------------------------------------------------
5257-- NOTE: Errors type classes. These type classes are not in separate --
@@ -103,6 +108,13 @@ type family (:++:) (a :: [k]) (b :: [k]) :: [k] where
103108 '[] :++: b = b
104109 (a ': as) :++: b = a ': (as :++: b)
105110
111+appendId
112+ :: forall proxy l r
113+ . proxy l
114+ -> (l ~ (l :++: '[]) => r)
115+ -> r
116+appendId = unsafeCoerce id
117+
106118type IndexOf a s = FromJust (IndexOfMay a s)
107119
108120type IndexOfMay a s = IndexOfMay' Z a s
@@ -156,6 +168,12 @@ type family SubList (a :: [k]) (b :: [k]) :: Constraint where
156168 SubList '[] bs = ()
157169 SubList (a ': as) bs = (Elem a bs, SubList as bs)
158170
171+subListId
172+ :: forall proxy l r
173+ . proxy l
174+ -> (SubList l l => r) -> r
175+subListId _ = unsafeCoerce id
176+
159177type family NotSubList (a :: [k]) (b :: [k]) :: Constraint where
160178 NotSubList '[] bs = ()
161179 NotSubList (a ': as) bs = (NotElem a bs, NotSubList as bs)
@@ -195,6 +213,12 @@ type family AppendUniq (a :: k) (s :: [k]) :: [k] where
195213-- taken from first list
196214type Intersect a b = (Indices (CatMaybes (IndicesOfMay a b)) b)
197215
216+-- | Removes from first list all elements occured in second
217+type family Substract (a :: [k]) (b :: [k]) :: [k] where
218+ Substract '[] b = '[]
219+ Substract a '[] = a
220+ Substract a (b ': bs) = Substract (Delete b a) bs
221+
198222-- | Checks that element 'a' occurs in a list just once
199223type ElementIsUniq a s = If (Equal (S Z) (Count a s))
200224 (() :: Constraint)
src/TypeFun/Data/Peano.hs+14−3
@@ -1,5 +1,6 @@
11module TypeFun.Data.Peano
22 ( N(..)
3+ , KnownPeano(..)
34 , ToNat
45 , FromNat
56 , (:+:)
@@ -7,14 +8,24 @@ module TypeFun.Data.Peano
78 , (:*:)
89 ) where
910
10−import Data.Typeable
11−import GHC.Generics (Generic)
12−import GHC.TypeLits
11+import Data.Typeable
12+import GHC.Generics (Generic)
13+import GHC.TypeLits
1314
1415data N = Z | S N
1516 deriving ( Eq, Ord, Read, Show
1617 , Generic, Typeable )
1718
19+-- | @since 0.1.2
20+class KnownPeano (p :: N) where
21+ peanoVal :: proxy p -> Integer
22+
23+instance KnownPeano Z where
24+ peanoVal _ = 0
25+
26+instance (KnownPeano n) => KnownPeano (S n) where
27+ peanoVal _ = succ $ peanoVal (Proxy :: Proxy n)
28+
1829type family ToNat (a :: N) :: Nat where
1930 ToNat Z = 0
2031 ToNat (S a) = 1 + (ToNat a)
stack.yamlnew file+9
@@ -0,0 +1,9 @@
1+nix:
2+ packages:
3+ - zlib
4+ - postgresql
5+
6+resolver: lts-13.21
7+
8+packages:
9+ - .
stack.yaml.locknew file+12
@@ -0,0 +1,12 @@
1+# This file was autogenerated by Stack.
2+# You should not edit this file by hand.
3+# For more information, please see the documentation at:
4+# https://docs.haskellstack.org/en/stable/lock_files
5+
6+packages: []
7+snapshots:
8+- completed:
9+ size: 498180
10+ url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/13/21.yaml
11+ sha256: eff2de19a6d4691ccbf6edc1fba858f1918683047dce0f09adede874bbd2a8f3
12+ original: lts-13.21
type-fun.cabal+12−10
@@ -1,29 +1,31 @@
1−-- Initial type-fun.cabal generated by cabal init. For further
2−-- documentation, see http://haskell.org/cabal/users-guide/
3−
41name: type-fun
5−version: 0.0.1
2+version: 0.1.2
63synopsis: Collection of widely reimplemented type families
7−-- description:
84license: BSD3
95license-file: LICENSE
106author: Aleksey Uimanov
117maintainer: s9gf4ult@gmail.com
12−-- copyright:
138category: Dependent Types
149build-type: Simple
15−-- extra-source-files:
10+extra-source-files: CHANGELOG.md
1611cabal-version: >=1.10
12+homepage: https://github.com/s9gf4ult/type-fun
13+source-repository head
14+ type: git
15+ location: git@github.com:s9gf4ult/type-fun.git
1716
1817library
1918 default-language: Haskell2010
2019 hs-source-dirs: src
2120 default-extensions: ConstraintKinds
2221 , DataKinds
22+ , DeriveDataTypeable
2323 , DeriveGeneric
2424 , FlexibleInstances
2525 , MultiParamTypeClasses
2626 , PolyKinds
27+ , RankNTypes
28+ , ScopedTypeVariables
2729 , TypeFamilies
2830 , TypeOperators
2931 , UndecidableInstances
@@ -34,15 +36,15 @@ library
3436 , TypeFun.Data.Maybe
3537 , TypeFun.Data.Peano
3638
37− build-depends: base >=4.7 && <4.9
38−
39+ build-depends: base >= 4.7 && < 5
3940
4041test-suite example
4142 type: exitcode-stdio-1.0
4243 default-language: Haskell2010
4344 hs-source-dirs: example
4445 main-is: Main.hs
45− default-extensions: DataKinds
46+ default-extensions: ConstraintKinds
47+ , DataKinds
4648 , GADTs
4749 , TemplateHaskell
4850 , TypeFamilies