git.iko.soy/patch
on develop help sign in
Remove dependency on HList
495e7f8Ryan Trinkle
reflex.cabal−1
compare with develop
unifiedsplit
@@ -23,7 +23,6 @@ library
23 these,
23 these,
24 lens,
24 lens,
25 primitive,
25 primitive,
26− HList,
27 template-haskell
26 template-haskell
28
27
29 exposed-modules:
28 exposed-modules:
src/Reflex/Dynamic.hs+35−1
@@ -46,7 +46,41 @@ import qualified Data.Dependent.Map as DMap
46import Data.Dependent.Sum (DSum (..))
46import Data.Dependent.Sum (DSum (..))
47import Data.GADT.Compare (GCompare (..), GEq (..), (:~:) (..), GOrdering (..))
47import Data.GADT.Compare (GCompare (..), GEq (..), (:~:) (..), GOrdering (..))
48import Data.Monoid
48import Data.Monoid
49−import Data.HList (HList (..), hBuild)
49+--import Data.HList (HList (..), hBuild)
50+
51+data HList (l::[*]) where
52+ HNil :: HList '[]
53+ HCons :: e -> HList l -> HList (e ': l)
54+
55+infixr 2 `HCons`
56+
57+type family HRevApp (l1 :: [k]) (l2 :: [k]) :: [k]
58+type instance HRevApp '[] l = l
59+type instance HRevApp (e ': l) l' = HRevApp l (e ': l')
60+
61+hRevApp :: HList l1 -> HList l2 -> HList (HRevApp l1 l2)
62+hRevApp HNil l = l
63+hRevApp (HCons x l) l' = hRevApp l (HCons x l')
64+
65+hReverse l = hRevApp l HNil
66+
67+hEnd :: HList l -> HList l
68+hEnd = id
69+
70+hBuild :: (HBuild' '[] r) => r
71+hBuild = hBuild' HNil
72+
73+class HBuild' l r where
74+ hBuild' :: HList l -> r
75+
76+instance (l' ~ HRevApp l '[])
77+ => HBuild' l (HList l') where
78+ hBuild' l = hReverse l
79+
80+instance HBuild' (a ': l) r
81+ => HBuild' l (a->r) where
82+ hBuild' l x = hBuild' (HCons x l)
83+
50
84
51data Dynamic t a
85data Dynamic t a
52 = Dynamic (Behavior t a) (Event t a)
86 = Dynamic (Behavior t a) (Event t a)