projects
/
matthijs
/
master-project
/
cλash.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://github.com/darchon/clash into cλash
[matthijs/master-project/cλash.git]
/
Generate.hs
diff --git
a/Generate.hs
b/Generate.hs
index 1af1be33a63c977b0e5630f2fd32c0dec097efc5..f4cab36460d4f1b1b9e39ce5dc8819a582c68102 100644
(file)
--- a/
Generate.hs
+++ b/
Generate.hs
@@
-42,17
+42,8
@@
genExprArgs wrap dst func args = do
args' <- eitherCoreOrExprArgs args
wrap dst func args'
args' <- eitherCoreOrExprArgs args
wrap dst func args'
-idM :: a -> VHDLSession a
-idM e = return e
-
-eitherM :: (a -> m c) -> (b -> m c) -> Either a b -> m c
-eitherM f1 f2 e = do
- case e of
- Left e1 -> f1 e1
- Right e2 -> f2 e2
-
eitherCoreOrExprArgs :: [Either CoreSyn.CoreExpr AST.Expr] -> VHDLSession [AST.Expr]
eitherCoreOrExprArgs :: [Either CoreSyn.CoreExpr AST.Expr] -> VHDLSession [AST.Expr]
-eitherCoreOrExprArgs args = mapM (
eitherM (\x -> MonadState.lift vsType $ (varToVHDLExpr (exprToVar x))) idM
) args
+eitherCoreOrExprArgs args = mapM (
Either.either ((MonadState.lift vsType) . varToVHDLExpr . exprToVar) return
) args
-- | A function to wrap a builder-like function that expects its arguments to
-- be variables.
-- | A function to wrap a builder-like function that expects its arguments to
-- be variables.