From 2d8d8ba3c3938655e297a52b05366c7a6817f67e Mon Sep 17 00:00:00 2001 From: Yann Herklotz Date: Thu, 29 Nov 2018 18:54:41 +0000 Subject: Add some simplifications (map -> fmap) --- src/Test/VeriFuzz/CodeGen.hs | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'src/Test/VeriFuzz/CodeGen.hs') diff --git a/src/Test/VeriFuzz/CodeGen.hs b/src/Test/VeriFuzz/CodeGen.hs index 1810aae..a19c83c 100644 --- a/src/Test/VeriFuzz/CodeGen.hs +++ b/src/Test/VeriFuzz/CodeGen.hs @@ -29,19 +29,20 @@ toOperator Xor = " ^ " sep :: (Monoid a) => a -> [a] -> a sep el l = fromMaybe mempty $ - (fromList . map (<>el) <$> safe init l) <> safe last l + (fromList . fmap (<>el) <$> safe init l) <> safe last l statList :: Gate -> [Node] -> Maybe Text statList g n = toStr <$> safe tail n where - toStr = fromList . map ((<> toOperator g) . fromNode) + toStr = fromList . fmap ((<> toOperator g) . fromNode) lastEl :: [Node] -> Maybe Text lastEl n = fromNode <$> safe head n toStatement :: (Graph gr) => gr Gate e -> LNode Gate -> Text toStatement graph (n, g) = - fromMaybe empty $ Just " assign " <> Just (fromNode n) <> Just " = " <> statList g nodeL <> lastEl nodeL <> Just ";\n" + fromMaybe empty $ Just " assign " <> Just (fromNode n) + <> Just " = " <> statList g nodeL <> lastEl nodeL <> Just ";\n" where nodeL = pre graph n @@ -51,7 +52,7 @@ generate graph = <> fromList (imap " input wire " ",\n" inp) <> sep ",\n" (imap " output wire " "" out) <> ");\n" - <> fromList (map (toStatement graph) (labNodes graph)) + <> fromList (toStatement graph <$> labNodes graph) <> "endmodule\n\nmodule main;\n initial\n begin\n " <> "$display(\"Hello, world\");\n $finish;\n " <> "end\nendmodule" @@ -59,4 +60,4 @@ generate graph = zero fun1 fun2 n = fun1 graph n == 0 && fun2 graph n /= 0 inp = filterGr graph $ zero indeg outdeg out = filterGr graph $ zero outdeg indeg - imap b e = map ((\s -> b <> s <> e) . fromNode) + imap b e = fmap ((\s -> b <> s <> e) . fromNode) -- cgit