diff options
| author | krasimir <krasimir@chalmers.se> | 2010-12-08 12:51:37 +0000 |
|---|---|---|
| committer | krasimir <krasimir@chalmers.se> | 2010-12-08 12:51:37 +0000 |
| commit | 73a10e1a66920eefe9c95f9e14475a91d81eabed (patch) | |
| tree | 97171b71935aa982426df851a279182086c576b1 /src/compiler/GF | |
| parent | 55bd1cb8d06ad52dcf0a67c6e7e3ddce2b62acc3 (diff) | |
some more functions in GF.Data.TrieMap
Diffstat (limited to 'src/compiler/GF')
| -rw-r--r-- | src/compiler/GF/Data/TrieMap.hs | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/src/compiler/GF/Data/TrieMap.hs b/src/compiler/GF/Data/TrieMap.hs index 5392b6c0d..996d91ec7 100644 --- a/src/compiler/GF/Data/TrieMap.hs +++ b/src/compiler/GF/Data/TrieMap.hs @@ -17,10 +17,15 @@ module GF.Data.TrieMap , elems
, toList
+ , fromList, fromListWith
+
+ , map
+ , mapWithKey
) where
-import Prelude hiding (lookup, null)
+import Prelude hiding (lookup, null, map)
import qualified Data.Map as Map
+import Data.List (foldl')
data TrieMap k v = Tr (Maybe v) (Map.Map k (TrieMap k v))
@@ -80,3 +85,15 @@ toList :: TrieMap k v -> [([k],v)] toList tr = collect [] tr []
where
collect ks (Tr mb_v m) xs = maybe id (\v -> (:) (ks,v)) mb_v (Map.foldWithKey (\k -> collect (k:ks)) xs m)
+
+fromListWith :: Ord k => (v -> v -> v) -> [([k],v)] -> TrieMap k v
+fromListWith f xs = foldl' (\trie (ks,v) -> insertWith f ks v trie) empty xs
+
+fromList :: Ord k => [([k],v)] -> TrieMap k v
+fromList xs = fromListWith const xs
+
+map :: (a -> b) -> TrieMap k a -> TrieMap k b
+map f (Tr mb_v m) = Tr (fmap f mb_v) (Map.map (map f) m)
+
+mapWithKey :: ([k] -> a -> b) -> TrieMap k a -> TrieMap k b
+mapWithKey f (Tr mb_v m) = Tr (fmap (f []) mb_v) (Map.mapWithKey (\k -> mapWithKey (f . (k:))) m)
|