intern 0.2.2 → 0.2.2.1

raw patch · 3 files changed

+89/−2 lines, 3 filesPVP ok

version bump matches the API change (PVP)

API changes (from Hackage documentation)

Files

• Data/Interned/Internal.hs +1/−1
• examples/Term.hs +85/−0
• intern.cabal +3/−1

@@ -29,7 +29,7 @@  cacheSize :: Cache t -> IO Int cacheSize (Cache t) = do-  CacheState i m <- readMVar t+  CacheState _ m <- readMVar t   return (HashMap.size m)  mkCache :: Cache t

@@ -0,0 +1,85 @@+{-# LANGUAGE TypeFamilies+           , FlexibleInstances+           , FlexibleContexts+           , GeneralizedNewtypeDeriving #-}++module Term where++import Data.Function (on)+import Data.Hashable+import Data.Interned++type Var = Int++data Term+  = App {-# UNPACK #-} !(Id Term) !Term !Term+  | Lam {-# UNPACK #-} !(Id Term) {-# UNPACK #-} !Var !Term !Term+  | Pi  {-# UNPACK #-} !(Id Term) {-# UNPACK #-} !Var !Term !Term+  | Set {-# UNPACK #-} !(Id Term) {-# UNPACK #-} !Int+  deriving Show+data UninternedTerm +  = BApp Term Term+  | BLam Var Term Term +  | BPi  Var Term Term+  | BSet Int deriving Show+instance Interned Term where+  type Uninterned Term = UninternedTerm+  data Description Term = DApp (Id Term) (Id Term)+                 | DLam Var (Id Term) (Id Term)+                 | DPi  Var (Id Term) (Id Term)+                 | DSet Int deriving Show+  describe (BApp f a)   = DApp (identity f) (identity a) +  describe (BLam v t e) = DLam v (identity t) (identity e)+  describe (BPi v t e)  = DPi v (identity t) (identity e)+  describe (BSet n) = DSet n+  identify i = go where+    go (BApp f a) = App i f a +    go (BLam v t e) = Lam i v t e+    go (BPi v t e) = Pi i v t e+    go (BSet n) = Set i n+  identity (App i _ _) = i+  identity (Lam i _ _ _) = i+  identity (Pi i _ _ _) = i+  identity (Set i _) = i+  cache = termCache++instance Uninternable Term where+  unintern (App _ f a) = BApp f a+  unintern (Lam _ v t e) = BLam v t e+  unintern (Pi _ v t e) = BPi v t e+  unintern (Set _ n) = BSet n++termCache :: Cache Term+termCache = mkCache+{-# NOINLINE termCache #-}++instance Eq (Description Term) where+  DApp f a     == DApp f' a'    = f == f' && a == a'+  DLam v t e   == DLam v' t' e' = v == v' && t == t' && e == e'+  DPi v t e    == DPi v' t' e'  = v == v' && t == t' && e == e'+  DSet n       == DSet n'       = n == n'+  _            == _             = False++instance Hashable (Description Term) where+  hash (DApp f a)   = 0 `hashWithSalt` f `hashWithSalt` a+  hash (DLam v t e) = 1 `hashWithSalt` v `hashWithSalt` t `hashWithSalt` e+  hash (DPi v t e)  = 2 `hashWithSalt` v `hashWithSalt` t `hashWithSalt` e+  hash (DSet n)     = 3 `hashWithSalt` n++instance Eq Term where+  (==) = (==) `on` identity++instance Ord Term where+  compare = compare `on` identity++app :: Term -> Term -> Term+app a b = intern (BApp a b)++lam :: Var -> Term -> Term -> Term+lam v t e = intern (BLam v t e)++pi :: Var -> Term -> Term -> Term+pi v t e = intern (BPi v t e)++set :: Int -> Term+set i = intern (BSet i)

@@ -1,6 +1,6 @@ name:          intern category:      Data, Data Structures-version:       0.2.2+version:       0.2.2.1 license:       BSD3 cabal-version: >= 1.6 license-file:  LICENSE@@ -12,6 +12,8 @@ synopsis:      Efficient hash-consing for arbitrary data types description:   Efficient hash-consing for arbitrary data types build-type:    Simple+extra-source-files: +  examples/Term.hs  source-repository head   type: git