Store which binders become in scope in the CoreContext.

[matthijs/master-project/cλash.git] / clash / CLasH / Normalize / NormalizeTypes.hs

diff --git a/clash/CLasH/Normalize/NormalizeTypes.hs b/clash/CLasH/Normalize/NormalizeTypes.hs
index 4e98709eed26c2bf07dbbf5339014957cd44910d..506633de65e569548787d8c8deca83d3cc814755 100644 (file)
--- a/clash/CLasH/Normalize/NormalizeTypes.hs
+++ b/clash/CLasH/Normalize/NormalizeTypes.hs
@@ -21,14 +21,36 @@ data CoreContext = AppFirst        -- ^ The expression is the first
                  | AppSecond       -- ^ The expression is the second
                                    --   argument of an application
                                    --   (i.e., something is applied to it)
-                 | LetBinding      -- ^ The expression is bound in a
+                 | LetBinding [CoreSyn.CoreBndr]
+                                   -- ^ The expression is bound in a
                                    --   (recursive or non-recursive) let
                                    --   expression.
-                 | LetBody         -- ^ The expression is the body of a
+                 | LetBody [CoreSyn.CoreBndr]
+                                   -- ^ The expression is the body of a
                                    --   let expression
-                 | LambdaBody      -- ^ The expression is the body of a
+                 | LambdaBody CoreSyn.CoreBndr
+                                   -- ^ The expression is the body of a
                                    --   lambda abstraction
                  | Other           -- ^ Another context
   deriving (Eq, Show)
 -- | Transforms a CoreExpr and keeps track if it has changed.
 type Transform = [CoreContext] -> CoreSyn.CoreExpr -> TransformMonad CoreSyn.CoreExpr
+
+-- Predicates for each of the context types
+is_appfirst_ctx, is_appsecond_ctx, is_letbinding_ctx, is_letbody_ctx, is_lambdabody_ctx
+ :: CoreContext -> Bool
+
+is_appfirst_ctx AppFirst = True
+is_appfirst_ctx _ = False
+
+is_appsecond_ctx AppSecond = True
+is_appsecond_ctx _ = False
+
+is_letbinding_ctx (LetBinding _) = True
+is_letbinding_ctx _ = False
+
+is_letbody_ctx (LetBody _) = True
+is_letbody_ctx _ = False
+
+is_lambdabody_ctx (LambdaBody _) = True
+is_lambdabody_ctx _ = False