Reduce genSignals to a single line using Traversable.

[matthijs/master-project/cλash.git] / Flatten.hs

diff --git a/Flatten.hs b/Flatten.hs
index 15f99808600bb37cf2880405d48a3639dc78e478..c8b95b4d92dab4854de0a618febf3296b6ba0750 100644 (file)
--- a/Flatten.hs
+++ b/Flatten.hs
@@ -7,6 +7,7 @@ import qualified Name
 import qualified Maybe
 import qualified DataCon
 import qualified CoreUtils
+import qualified Data.Traversable as Traversable
 import Control.Applicative
 import Outputable ( showSDoc, ppr )
 import qualified Control.Monad.State as State
@@ -27,23 +28,10 @@ genSignals ::
   Type.Type
   -> FlattenState (SignalMap UnnamedSignal)
 
-genSignals ty = do
-  typeMapToUseMap tymap
-  where
-    -- First generate a map with the right structure containing the types
-    tymap = mkHsValueMap ty
-
-typeMapToUseMap ::
-  HsValueMap Type.Type
-  -> FlattenState (SignalMap UnnamedSignal)
-
-typeMapToUseMap (Single ty) = do
-  id <- genSignalId
-  return $ Single id
-
-typeMapToUseMap (Tuple tymaps) = do
-  usemaps <- State.mapM typeMapToUseMap tymaps
-  return $ Tuple usemaps
+genSignals ty =
+  -- First generate a map with the right structure containing the types, and
+  -- generate signals for each of them.
+  Traversable.mapM (\ty -> genSignalId SigInternal ty) (mkHsValueMap ty)
 
 -- | Flatten a haskell function
 flattenFunction ::
@@ -53,12 +41,12 @@ flattenFunction ::
 
 flattenFunction _ (Rec _) = error "Recursive binders not supported"
 flattenFunction hsfunc bind@(NonRec var expr) =
-  FlatFunction args res apps conds
+  FlatFunction args res apps conds sigs
   where
-    init_state        = ([], [], 0)
+    init_state        = ([], [], [], 0)
     (fres, end_state) = State.runState (flattenExpr [] expr) init_state
     (args, res)       = fres
-    (apps, conds, _)  = end_state
+    (apps, conds, sigs, _)  = end_state
 
 flattenExpr ::
   BindMap