Make HsValueMap an instance of Functor.

diff --git a/Flatten.hs b/Flatten.hs
index 7ce63a536a40595211a59e8888e065adf4931080..42ce020766849b3e16204d78d397ca9f3f00d870 100644 (file)
--- a/Flatten.hs
+++ b/Flatten.hs
@@ -17,7 +17,9 @@ data HsValueMap mapto =
   | Single mapto
   deriving (Show, Eq)
 
-
+instance Functor HsValueMap where
+  fmap f (Single s) = Single (f s)
+  fmap f (Tuple maps) = Tuple (fmap (fmap f) maps)
 
 -- | Creates a HsValueMap with the same structure as the given type, using the
 --   given function for mapping the single types.
@@ -57,8 +59,7 @@ type SignalUseMap = HsValueMap SignalUse
 type SignalDefMap = HsValueMap SignalDef
 
 useMapToDefMap :: SignalUseMap -> SignalDefMap
-useMapToDefMap (Single (SignalUse u)) = Single (SignalDef u)
-useMapToDefMap (Tuple uses) = Tuple (map useMapToDefMap uses)
+useMapToDefMap = fmap (\(SignalUse u) -> SignalDef u)
 
 type SignalId = Int
 data SignalUse = SignalUse {