on 7c20294 help sign in
11 files changed+38−180
since splitsnapshots
unifiedsplit
.gitignore−3 CHANGELOG.md−23 example/Main.hs+3−5 src/TypeFun/Constraint.hs+1−4 src/TypeFun/Data/Eq.hs+1−3 src/TypeFun/Data/List.hs+17−76 src/TypeFun/Data/Maybe.hs+2−11 src/TypeFun/Data/Peano.hs+4−22 stack.yaml−9 stack.yaml.lock−12 type-fun.cabal+10−12
.gitignore−3
@@ -1,5 +1,2 @@
11dist
22TAGS
3−.cabal-sandbox
4−cabal.sandbox.config
5−.stack-work
CHANGELOG.mddeleted−23
@@ -1,23 +0,0 @@
1−# TODO
2−* Add doctests
3−* Add TyFun from singletons (or just depend from)?
4−
5−# CHANGELOG
6−
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−
22−## 0.0.1
23−First version
example/Main.hs+3−5
@@ -18,10 +18,9 @@ sublistConstr p = elemConstr p + 1
1818prefixConstr :: (IsPrefixOf '[Int, Bool] l) => proxy l -> Int
1919prefixConstr p = sublistConstr p + 1
2020
21−-- | This function has narrower constraint
22−-- __Int is inside of l and it is a first argument__
23−-- and uses inside more wide function
24−indexConstr :: (('Just 'Z) ~ (IndexOfMay Int l)) => proxy l -> Int
21+-- | This function has narrower constraint __Int is inside of l and it
22+-- is a first argument__ and uses inside more wide function
23+indexConstr :: (('Just 'Z) ~ (IndexOf Int l)) => proxy l -> Int
2524indexConstr p = elemConstr p + 1
2625
2726uniqConstr :: (UniqElements l) => proxy l -> Int
@@ -37,5 +36,4 @@ main = do
3736 print $ prefixConstr p2
3837 print $ prefixConstr p3
3938 print $ uniqConstr p2
40− print $ peanoVal (Proxy :: Proxy (FromNat 100))
4139 -- print $ uniqConstr p3 -- < ElementIsNotUniqInList Int '[Int, Bool, Int]
src/TypeFun/Constraint.hs+1−4
@@ -1,10 +1,7 @@
1−module TypeFun.Constraint
2− ( AllSatisfy
3− ) where
1+module TypeFun.Constraint where
42
53import GHC.Exts
64
7−-- | Apply constraint for each element of list
85type family AllSatisfy (c :: k -> Constraint) (s :: [k]) :: Constraint where
96 AllSatisfy c '[] = ()
107 AllSatisfy c (a ': as) = (c a, AllSatisfy c as)
src/TypeFun/Data/Eq.hs+1−3
@@ -1,6 +1,4 @@
1−module TypeFun.Data.Eq
2− ( Equal
3− ) where
1+module TypeFun.Data.Eq where
42
53type family Equal (a :: k) (b :: k) :: Bool where
64 Equal a a = 'True
src/TypeFun/Data/List.hs+17−76
@@ -9,17 +9,11 @@ module TypeFun.Data.List
99 , Drop
1010 , Take
1111 , Delete
12− , Remove
13− , (:++:)
1412 -- * Elements lookup
1513 , IndexOf
16− , IndexOfMay
17− , IndexOfMay'
18− , IndicesOfMay
14+ , IndexOf'
1915 , IndicesOf
2016 , Index
21− , IndexMay
22− , IndicesMay
2317 , Indices
2418 , Elem
2519 , NotElem
@@ -30,19 +24,13 @@ module TypeFun.Data.List
3024 , IsPrefixOf
3125 , IsNotPrefixOf
3226 , IsPrefixOfBool
33− -- * Set operations
3427 , Union
35− , UnionList
3628 , AppendUniq
3729 , Intersect
38− , Substract
3930 -- * Uniqueness checking
4031 , ElementIsUniq
4132 , UniqElements
4233 , UniqElements'
43− -- * Unsafe helpers
44− , appendId
45− , subListId
4634 ) where
4735
4836import Data.Type.Bool
@@ -51,7 +39,6 @@ import GHC.TypeLits
5139import TypeFun.Data.Eq
5240import TypeFun.Data.Maybe
5341import TypeFun.Data.Peano
54−import Unsafe.Coerce
5542
5643------------------------------------------------------------------------
5744-- NOTE: Errors type classes. These type classes are not in separate --
@@ -71,8 +58,6 @@ class ListIsPrefixOf a b
7158
7259class ElementIsNotUniqInList a s
7360
74−class IndexNotFoundInList a s
75−
7661----------------------
7762-- main module code --
7863----------------------
@@ -98,62 +83,34 @@ type family Delete (a :: k) (s :: [k]) :: [k] where
9883 Delete a (a ': as) = Delete a as
9984 Delete a (b ': as) = b ': (Delete a as)
10085
101−-- | Remove index from the list
102−type family Remove (i :: N) (a :: [k]) :: [k] where
103− Remove i '[] = '[]
104− Remove 'Z (a ': as) = as
105− Remove ('S i) (a ': as) = a ': (Remove i as)
106−
107−type family (:++:) (a :: [k]) (b :: [k]) :: [k] where
108− '[] :++: b = b
109− (a ': as) :++: b = a ': (as :++: b)
110−
111−appendId
112− :: forall proxy l r
113− . proxy l
114− -> (l ~ (l :++: '[]) => r)
115− -> r
116−appendId = unsafeCoerce id
117−
118−type IndexOf a s = FromJust (IndexOfMay a s)
119−
120−type IndexOfMay a s = IndexOfMay' Z a s
121−
122−type family IndexOfMay' (acc :: N) (a :: k) (s :: [k]) :: Maybe N where
123− IndexOfMay' acc a '[] = 'Nothing
124− IndexOfMay' acc a (a ': as) = 'Just acc
125− IndexOfMay' acc a (b ': as) = IndexOfMay' (S acc) a as
86+type IndexOf a s = IndexOf' Z a s
12687
127−type family IndicesOfMay (a :: [k]) (b :: [k]) :: [Maybe N] where
128− IndicesOfMay '[] bs = '[]
129− IndicesOfMay (a ': as) bs = (IndexOfMay a bs) ': (IndicesOfMay as bs)
88+type family IndexOf' (acc :: N) (a :: k) (s :: [k]) :: Maybe N where
89+ IndexOf' acc a '[] = 'Nothing
90+ IndexOf' acc a (a ': as) = 'Just acc
91+ IndexOf' acc a (b ': as) = IndexOf' (S acc) a as
13092
131−type family IndicesOf (a :: [k]) (b :: [k]) :: [N] where
93+type family IndicesOf (a :: [k]) (b :: [k]) :: [Maybe N] where
13294 IndicesOf '[] bs = '[]
13395 IndicesOf (a ': as) bs = (IndexOf a bs) ': (IndicesOf as bs)
13496
135−type Index idx s = FromJust (IndexMay idx s)
97+type family Index (idx :: N) (s :: [k]) :: Maybe k where
98+ Index idx '[] = 'Nothing
99+ Index Z (a ': as) = 'Just a
100+ Index (S idx) (a ': as) = Index idx as
136101
137−type family IndexMay (idx :: N) (s :: [k]) :: Maybe k where
138− IndexMay idx '[] = 'Nothing
139− IndexMay Z (a ': as) = 'Just a
140− IndexMay (S idx) (a ': as) = IndexMay idx as
141−
142−type family IndicesMay (idxs :: [N]) (a :: [k]) :: [Maybe k] where
143− IndicesMay '[] as = '[]
144− IndicesMay (i ': idxs) as = (IndexMay i as) ': (IndicesMay idxs as)
145−
146−type family Indices (idxs :: [N]) (a :: [k]) :: [k] where
147− Indices '[] as = '[]
102+type family Indices (idxs :: [N]) (a :: [k]) :: [Maybe k] where
103+ Indices '[] as = '[]
148104 Indices (i ': idxs) as = (Index i as) ': (Indices idxs as)
149105
106+
150107-- | Generates unresolvable constraint if fists element is not
151108-- contained inside of second
152−type Elem a s = NothingToConstr (IndexOfMay a s)
109+type Elem a s = NothingToConstr (IndexOf a s)
153110 (ElementNotFoundInList a s)
154111
155112-- | Reverse of 'Elem'
156−type NotElem a s = JustToConstr (IndexOfMay a s)
113+type NotElem a s = JustToConstr (IndexOf a s)
157114 (ElementIsInList a s)
158115
159116-- | Count elements in a list
@@ -168,12 +125,6 @@ type family SubList (a :: [k]) (b :: [k]) :: Constraint where
168125 SubList '[] bs = ()
169126 SubList (a ': as) bs = (Elem a bs, SubList as bs)
170127
171−subListId
172− :: forall proxy l r
173− . proxy l
174− -> (SubList l l => r) -> r
175−subListId _ = unsafeCoerce id
176−
177128type family NotSubList (a :: [k]) (b :: [k]) :: Constraint where
178129 NotSubList '[] bs = ()
179130 NotSubList (a ': as) bs = (NotElem a bs, NotSubList as bs)
@@ -199,10 +150,6 @@ type family Union (a :: [k]) (b :: [k]) :: [k] where
199150 Union '[] bs = bs
200151 Union (a ': as) bs = Union as (AppendUniq a bs)
201152
202−type family UnionList (l :: [[k]]) :: [k] where
203− UnionList '[] = '[]
204− UnionList (a ': as) = Union a (UnionList as)
205−
206153-- | Append element to list if element is not already presented in
207154type family AppendUniq (a :: k) (s :: [k]) :: [k] where
208155 AppendUniq a (a ': bs) = a ': bs
@@ -211,13 +158,7 @@ type family AppendUniq (a :: k) (s :: [k]) :: [k] where
211158
212159-- | Calculates intersection between two lists. Order of elements is
213160-- taken from first list
214−type Intersect a b = (Indices (CatMaybes (IndicesOfMay a b)) b)
215−
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
161+type Intersect a b = (CatMaybes (Indices (CatMaybes (IndicesOf a b)) b))
221162
222163-- | Checks that element 'a' occurs in a list just once
223164type ElementIsUniq a s = If (Equal (S Z) (Count a s))
src/TypeFun/Data/Maybe.hs+2−11
@@ -1,10 +1,4 @@
1−module TypeFun.Data.Maybe
2− ( MaybeCase
3− , NothingToConstr
4− , JustToConstr
5− , CatMaybes
6− , FromJust
7− ) where
1+module TypeFun.Data.Maybe where
82
93import GHC.Exts
104
@@ -14,6 +8,7 @@ type family MaybeCase (a :: Maybe k)
148 MaybeCase 'Nothing nothing just = nothing
159 MaybeCase ('Just k) nothing just = just k
1610
11+
1712type family NothingToConstr (a :: Maybe k) (c :: Constraint) :: Constraint where
1813 NothingToConstr 'Nothing c = c
1914 NothingToConstr ('Just a) c = ()
@@ -22,11 +17,7 @@ type family JustToConstr (a :: Maybe k) (c :: Constraint) :: Constraint where
2217 JustToConstr 'Nothing c = ()
2318 JustToConstr ('Just a) c = c
2419
25−-- | Like 'catMaybes' for type lists
2620type family CatMaybes (l :: [Maybe k]) :: [k] where
2721 CatMaybes '[] = '[]
2822 CatMaybes (('Just a) ': as) = a ': (CatMaybes as)
2923 CatMaybes ('Nothing ': as) = CatMaybes as
30−
31−type family FromJust (a :: Maybe k) :: k where
32− FromJust ('Just a) = a
src/TypeFun/Data/Peano.hs+4−22
@@ -1,31 +1,13 @@
1−module TypeFun.Data.Peano
2− ( N(..)
3− , KnownPeano(..)
4− , ToNat
5− , FromNat
6− , (:+:)
7− , (:-:)
8− , (:*:)
9− ) where
1+module TypeFun.Data.Peano where
102
11−import Data.Typeable
12−import GHC.Generics (Generic)
13−import GHC.TypeLits
3+import Data.Typeable
4+import GHC.Generics (Generic)
5+import GHC.TypeLits
146
157data N = Z | S N
168 deriving ( Eq, Ord, Read, Show
179 , Generic, Typeable )
1810
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−
2911type family ToNat (a :: N) :: Nat where
3012 ToNat Z = 0
3113 ToNat (S a) = 1 + (ToNat a)
stack.yamldeleted−9
@@ -1,9 +0,0 @@
1−nix:
2− packages:
3− - zlib
4− - postgresql
5−
6−resolver: lts-13.21
7−
8−packages:
9− - .
stack.yaml.lockdeleted−12
@@ -1,12 +0,0 @@
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+10−12
@@ -1,31 +1,29 @@
1+-- Initial type-fun.cabal generated by cabal init. For further
2+-- documentation, see http://haskell.org/cabal/users-guide/
3+
14name: type-fun
2−version: 0.1.2
5+version: 0.0.1
36synopsis: Collection of widely reimplemented type families
7+-- description:
48license: BSD3
59license-file: LICENSE
610author: Aleksey Uimanov
711maintainer: s9gf4ult@gmail.com
12+-- copyright:
813category: Dependent Types
914build-type: Simple
10−extra-source-files: CHANGELOG.md
15+-- extra-source-files:
1116cabal-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
1617
1718library
1819 default-language: Haskell2010
1920 hs-source-dirs: src
2021 default-extensions: ConstraintKinds
2122 , DataKinds
22− , DeriveDataTypeable
2323 , DeriveGeneric
2424 , FlexibleInstances
2525 , MultiParamTypeClasses
2626 , PolyKinds
27− , RankNTypes
28− , ScopedTypeVariables
2927 , TypeFamilies
3028 , TypeOperators
3129 , UndecidableInstances
@@ -36,15 +34,15 @@ library
3634 , TypeFun.Data.Maybe
3735 , TypeFun.Data.Peano
3836
39− build-depends: base >= 4.7 && < 5
37+ build-depends: base >=4.7 && <4.9
38+
4039
4140test-suite example
4241 type: exitcode-stdio-1.0
4342 default-language: Haskell2010
4443 hs-source-dirs: example
4544 main-is: Main.hs
46− default-extensions: ConstraintKinds
47− , DataKinds
45+ default-extensions: DataKinds
4846 , GADTs
4947 , TemplateHaskell
5048 , TypeFamilies