X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=Generate.hs;h=35909e14546483d7cb2de4a2710086ef5801bd38;hb=30414e977c5c4ba3c16441a281601c7c68f0fb6e;hp=5be869459ff445576861811d7cec822ba24d70d6;hpb=49191910156ccec4bb69ae24c69182a702691c60;p=matthijs%2Fmaster-project%2Fc%CE%BBash.git

diff --git a/Generate.hs b/Generate.hs
index 5be8694..35909e1 100644
--- a/Generate.hs
+++ b/Generate.hs
@@ -100,12 +100,12 @@ genMap' (Left res) f [mapped_f, arg] = do
     genScheme   = AST.ForGn nPar range
     -- Get the entity name and port names
     entity_id   = ent_id entity
-    argports   = map (Monad.liftM fst) (ent_args entity)
-    resport     = (Monad.liftM fst) (ent_res entity)
+    argports   = map fst (ent_args entity)
+    resport     = fst (ent_res entity)
     -- Assign the ports
     inport      = mkAssocElemIndexed (argports!!0) (varToVHDLId arg) nPar
     outport     = mkAssocElemIndexed resport (varToVHDLId res) nPar
-    portassigns = Maybe.catMaybes [inport,outport]
+    portassigns = [inport,outport]
     -- Generate the portmap
     mapLabel    = "map" ++ (AST.fromVHDLId entity_id)
     compins     = mkComponentInst mapLabel entity_id portassigns
@@ -133,13 +133,13 @@ genZipWith' (Left res) f args@[zipped_f, arg1, arg2] = do
     genScheme   = AST.ForGn nPar range
     -- Get the entity name and port names
     entity_id   = ent_id entity
-    argports    = map (Monad.liftM fst) (ent_args entity)
-    resport     = (Monad.liftM fst) (ent_res entity)
+    argports    = map fst (ent_args entity)
+    resport     = fst (ent_res entity)
     -- Assign the ports
     inport1     = mkAssocElemIndexed (argports!!0) (varToVHDLId arg1) nPar
     inport2     = mkAssocElemIndexed (argports!!1) (varToVHDLId arg2) nPar 
     outport     = mkAssocElemIndexed resport (varToVHDLId res) nPar
-    portassigns = Maybe.catMaybes [inport1,inport2,outport]
+    portassigns = [inport1,inport2,outport]
     -- Generate the portmap
     mapLabel    = "zipWith" ++ (AST.fromVHDLId entity_id)
     compins     = mkComponentInst mapLabel entity_id portassigns