X-Git-Url: http://git.cielonegro.org/gitweb.cgi?p=hs-rrdtool.git;a=blobdiff_plain;f=Data%2FHList%2FPrelude.hs;h=3a46616662132331d8479a57ee70692cf9eed6ef;hp=856c677c67d629b70adea88519a41c863909d988;hb=000307857df5266907964aff4ecc9e118314fe3f;hpb=256aad40f96ce034bc1aebd3302ecd8a86419163

diff --git a/Data/HList/Prelude.hs b/Data/HList/Prelude.hs
index 856c677..3a46616 100644
--- a/Data/HList/Prelude.hs
+++ b/Data/HList/Prelude.hs
@@ -12,40 +12,40 @@
   UndecidableInstances
   #-}
 module Data.HList.Prelude
-    ( HList
+    ( List
 
-    , HNil(..)
+    , Nil(..)
     , hNil
 
-    , HCons(..)
+    , Cons(..)
     , hCons
 
-    , HExtendT(..)
-    , HAppendT(..)
+    , ExtendT(..)
+    , AppendT(..)
 
     , ApplyT(..)
     , Apply2T(..)
 
     , Id(..)
-    , HAppendA(..)
+    , AppendA(..)
 
-    , HFoldrT(..)
-    , HConcatT(..)
-    , HMapT(..)
+    , FoldrT(..)
+    , ConcatT(..)
+    , MapT(..)
 
-    , HAll
-    , HLength
+    , All
+    , Length
 
     , Fail
     , TypeFound
     , TypeNotFound
-    , HOccursMany(..)
-    , HOccursMany1(..)
-    , HOccursOpt(..)
-    , HOccurs(..)
-    , HOccursNot
+    , OccursMany(..)
+    , OccursMany1(..)
+    , OccursOpt(..)
+    , Occurs(..)
+    , OccursNot
 
-    , HNoDuplicates
+    , NoDuplicates
     )
     where
 
@@ -54,62 +54,62 @@ import Types.Data.Bool
 import Types.Data.Num hiding ((:*:))
 
 
--- HList
-class HList l
+-- List
+class List l
 
--- HNil
-data HNil
-    = HNil
+-- Nil
+data Nil
+    = Nil
       deriving (Show, Eq, Ord, Read, Typeable)
 
-instance HList HNil
+instance List Nil
 
-hNil :: HNil
-hNil = HNil
+hNil :: Nil
+hNil = Nil
 
--- HCons
-data HCons e l
-    = HCons e l
+-- Cons
+data Cons e l
+    = Cons e l
       deriving (Show, Eq, Ord, Read, Typeable)
 
-instance HList l => HList (HCons e l)
+instance List l => List (Cons e l)
 
-hCons :: HList l => e -> l -> HCons e l
-hCons = HCons
+hCons :: List l => e -> l -> Cons e l
+hCons = Cons
 
--- HExtendT
+-- ExtendT
 infixr 2 :&:
 infixr 2 .&.
 
-class HExtendT e l where
+class ExtendT e l where
     type e :&: l
     (.&.) :: e -> l -> e :&: l
 
-instance HExtendT e HNil where
-    type e :&: HNil = HCons e HNil
+instance ExtendT e Nil where
+    type e :&: Nil = Cons e Nil
     e .&. nil = hCons e nil
 
-instance HList l => HExtendT e (HCons e' l) where
-    type e :&: HCons e' l = HCons e (HCons e' l)
-    e .&. HCons e' l = hCons e (hCons e' l)
+instance List l => ExtendT e (Cons e' l) where
+    type e :&: Cons e' l = Cons e (Cons e' l)
+    e .&. Cons e' l = hCons e (hCons e' l)
 
--- HAppendT
+-- AppendT
 infixr 1 :++:
 infixr 1 .++.
 
-class HAppendT l l' where
+class AppendT l l' where
     type l :++: l'
     (.++.) :: l -> l' -> l :++: l'
 
-instance HList l => HAppendT HNil l where
-    type HNil :++: l = l
+instance List l => AppendT Nil l where
+    type Nil :++: l = l
     _ .++. l = l
 
-instance ( HList (l :++: l')
-         , HAppendT l l'
-         ) => HAppendT (HCons e l) l' where
-    type HCons e l :++: l' = HCons e (l :++: l')
-    (HCons e l) .++. l' = hCons e (l .++. l')
+instance ( List (l :++: l')
+         , AppendT l l'
+         ) => AppendT (Cons e l) l' where
+    type Cons e l :++: l' = Cons e (l :++: l')
+    (Cons e l) .++. l' = hCons e (l .++. l')
 
 -- ApplyT
 class ApplyT f a where
@@ -130,156 +130,156 @@ instance ApplyT Id a where
     type Apply Id a = a
     apply _ a = a
 
--- HAppendA
-data HAppendA = HAppendA
+-- AppendA
+data AppendA = AppendA
 
-instance HAppendT a b => Apply2T HAppendA a b where
-    type Apply2 HAppendA a b = a :++: b
+instance AppendT a b => Apply2T AppendA a b where
+    type Apply2 AppendA a b = a :++: b
     apply2 _ a b = a .++. b
 
--- HFoldrT
-class HFoldrT f v l where
-    type HFoldr f v l
-    hFoldr :: f -> v -> l -> HFoldr f v l
+-- FoldrT
+class FoldrT f v l where
+    type Foldr f v l
+    hFoldr :: f -> v -> l -> Foldr f v l
 
-instance HFoldrT f v HNil where
-    type HFoldr f v HNil = v
+instance FoldrT f v Nil where
+    type Foldr f v Nil = v
     hFoldr _ v _ = v
 
-instance ( HFoldrT f v l
-         , Apply2T f e (HFoldr f v l)
-         ) => HFoldrT f v (HCons e l) where
-    type HFoldr f v (HCons e l) = Apply2 f e (HFoldr f v l)
-    hFoldr f v (HCons e l) = apply2 f e (hFoldr f v l)
+instance ( FoldrT f v l
+         , Apply2T f e (Foldr f v l)
+         ) => FoldrT f v (Cons e l) where
+    type Foldr f v (Cons e l) = Apply2 f e (Foldr f v l)
+    hFoldr f v (Cons e l) = apply2 f e (hFoldr f v l)
 
--- HConcatT
-class HConcatT ls where
-    type HConcat ls
-    hConcat :: ls -> HConcat ls
+-- ConcatT
+class ConcatT ls where
+    type Concat ls
+    hConcat :: ls -> Concat ls
 
-instance HFoldrT HAppendA HNil ls => HConcatT ls where
-    type HConcat ls = HFoldr HAppendA HNil ls
-    hConcat ls = hFoldr HAppendA hNil ls
+instance FoldrT AppendA Nil ls => ConcatT ls where
+    type Concat ls = Foldr AppendA Nil ls
+    hConcat ls = hFoldr AppendA hNil ls
 
--- HMapT
-class HMapT f l where
-    type HMap f l
-    hMap :: f -> l -> HMap f l
+-- MapT
+class MapT f l where
+    type Map f l
+    hMap :: f -> l -> Map f l
 
-instance HMapT f HNil where
-    type HMap f HNil = HNil
+instance MapT f Nil where
+    type Map f Nil = Nil
     hMap _ _ = hNil
 
 instance ( ApplyT f x
-         , HMapT f xs
-         , HList (HMap f xs)
-         ) => HMapT f (HCons x xs) where
-    type HMap f (HCons x xs) = HCons (Apply f x) (HMap f xs)
-    hMap f (HCons x xs) = hCons (apply f x) (hMap f xs)
-
--- HAll
-type family HAll f l
-type instance HAll f HNil         = True
-type instance HAll f (HCons x xs) = If (Apply f x) (HAll f xs) False
-
--- HLength
-type family HLength l
-type instance HLength HNil        = D0
-type instance HLength (HCons e l) = Succ (HLength l)
+         , MapT f xs
+         , List (Map f xs)
+         ) => MapT f (Cons x xs) where
+    type Map f (Cons x xs) = Cons (Apply f x) (Map f xs)
+    hMap f (Cons x xs) = hCons (apply f x) (hMap f xs)
+
+-- All
+type family All f l
+type instance All f Nil         = True
+type instance All f (Cons x xs) = If (Apply f x) (All f xs) False
+
+-- Length
+type family Length l
+type instance Length Nil        = D0
+type instance Length (Cons e l) = Succ (Length l)
 
 -- Fail
 class Fail a
 
--- HOccursMany (zero or more)
-class HOccursMany e l where
+-- OccursMany (zero or more)
+class OccursMany e l where
     hOccursMany :: l -> [e]
 
-instance HOccursMany e HNil where
+instance OccursMany e Nil where
     hOccursMany _ = []
 
-instance ( HList l
-         , HOccursMany e l
+instance ( List l
+         , OccursMany e l
          )
-    => HOccursMany e (HCons e l)
+    => OccursMany e (Cons e l)
     where
-      hOccursMany (HCons e l) = e : hOccursMany l
+      hOccursMany (Cons e l) = e : hOccursMany l
 
-instance ( HList l
-         , HOccursMany e l
+instance ( List l
+         , OccursMany e l
          )
-    => HOccursMany e (HCons e' l)
+    => OccursMany e (Cons e' l)
     where
-      hOccursMany (HCons _ l) = hOccursMany l
+      hOccursMany (Cons _ l) = hOccursMany l
 
--- HOccursMany1 (one or more)
-class HOccursMany1 e l where
+-- OccursMany1 (one or more)
+class OccursMany1 e l where
     hOccursMany1 :: l -> [e]
 
-instance Fail (TypeNotFound e) => HOccursMany1 e HNil where
+instance Fail (TypeNotFound e) => OccursMany1 e Nil where
     hOccursMany1 _ = undefined
 
-instance ( HList l
-         , HOccursMany e l
+instance ( List l
+         , OccursMany e l
          )
-    => HOccursMany1 e (HCons e l)
+    => OccursMany1 e (Cons e l)
     where
-      hOccursMany1 (HCons e l) = e : hOccursMany l
+      hOccursMany1 (Cons e l) = e : hOccursMany l
 
-instance ( HList l
-         , HOccursMany1 e l
+instance ( List l
+         , OccursMany1 e l
          )
-    => HOccursMany1 e (HCons e' l)
+    => OccursMany1 e (Cons e' l)
     where
-      hOccursMany1 (HCons _ l) = hOccursMany1 l
+      hOccursMany1 (Cons _ l) = hOccursMany1 l
 
--- HOccursOpt (zero or one)
-class HOccursOpt e l where
+-- OccursOpt (zero or one)
+class OccursOpt e l where
     hOccursOpt :: l -> Maybe e
 
-instance HOccursOpt e HNil where
+instance OccursOpt e Nil where
     hOccursOpt _ = Nothing
 
-instance HOccursNot e l => HOccursOpt e (HCons e l) where
-    hOccursOpt (HCons e _) = Just e
+instance OccursNot e l => OccursOpt e (Cons e l) where
+    hOccursOpt (Cons e _) = Just e
 
-instance HOccursOpt e l => HOccursOpt e (HCons e' l) where
-    hOccursOpt (HCons _ l) = hOccursOpt l
+instance OccursOpt e l => OccursOpt e (Cons e' l) where
+    hOccursOpt (Cons _ l) = hOccursOpt l
 
--- HOccurs (one)
-class HOccurs e l where
+-- Occurs (one)
+class Occurs e l where
     hOccurs :: l -> e
 
 data TypeNotFound e
 
-instance Fail (TypeNotFound e) => HOccurs e HNil
+instance Fail (TypeNotFound e) => Occurs e Nil
     where
       hOccurs = undefined
 
-instance ( HList l
-         , HOccursNot e l
+instance ( List l
+         , OccursNot e l
          )
-    => HOccurs e (HCons e l)
+    => Occurs e (Cons e l)
     where
-      hOccurs (HCons e _) = e
+      hOccurs (Cons e _) = e
 
-instance ( HList l
-         , HOccurs e l
+instance ( List l
+         , Occurs e l
          )
-    => HOccurs e (HCons e' l)
+    => Occurs e (Cons e' l)
     where
-      hOccurs (HCons _ l) = hOccurs l
+      hOccurs (Cons _ l) = hOccurs l
 
--- HOccursNot (zero)
+-- OccursNot (zero)
 data     TypeFound e
-class    HOccursNot e l
-instance HOccursNot e HNil
-instance Fail (TypeFound e) => HOccursNot e (HCons e  l)
-instance HOccursNot e l     => HOccursNot e (HCons e' l)
-
--- HNoDuplicates
-class    HNoDuplicates l
-instance HNoDuplicates HNil
-instance HOccursNot e l => HNoDuplicates (HCons e l)
+class    OccursNot e l
+instance OccursNot e Nil
+instance Fail (TypeFound e) => OccursNot e (Cons e  l)
+instance OccursNot e l     => OccursNot e (Cons e' l)
+
+-- NoDuplicates
+class    NoDuplicates l
+instance NoDuplicates Nil
+instance OccursNot e l => NoDuplicates (Cons e l)
 
 {-
 {-