From dbe0a9e8250477728eb8a652fc92c35dbd018830 Mon Sep 17 00:00:00 2001 From: Yann Herklotz Date: Sat, 1 Dec 2018 16:48:13 +0000 Subject: Add more code to the shared code --- src/Test/VeriFuzz/Graph/CodeGen.hs | 20 +++++--------------- src/Test/VeriFuzz/Internal/Shared.hs | 10 ++++++++++ 2 files changed, 15 insertions(+), 15 deletions(-) (limited to 'src/Test') diff --git a/src/Test/VeriFuzz/Graph/CodeGen.hs b/src/Test/VeriFuzz/Graph/CodeGen.hs index 4cbd828..6f7aef6 100644 --- a/src/Test/VeriFuzz/Graph/CodeGen.hs +++ b/src/Test/VeriFuzz/Graph/CodeGen.hs @@ -2,10 +2,11 @@ module Test.VeriFuzz.Graph.CodeGen where -import Data.Graph.Inductive (Graph, LNode, Node, indeg, labNodes, - nodes, outdeg, pre) -import Data.Maybe (fromMaybe) -import Data.Text (Text, empty, pack) +import Data.Graph.Inductive (Graph, LNode, Node, indeg, + labNodes, nodes, outdeg, pre) +import Data.Maybe (fromMaybe) +import Data.Text (Text, empty, pack) +import Test.VeriFuzz.Internal.Shared import Test.VeriFuzz.Types fromNode :: Node -> Text @@ -15,22 +16,11 @@ filterGr :: (Graph gr) => gr n e -> (Node -> Bool) -> [Node] filterGr graph f = filter f $ nodes graph -fromList :: (Foldable t, Monoid a) => t a -> a -fromList = foldl mappend mempty - -safe :: ([a] -> b) -> [a] -> Maybe b -safe _ [] = Nothing -safe f l = Just $ f l - toOperator :: Gate -> Text toOperator And = " & " toOperator Or = " | " toOperator Xor = " ^ " -sep :: (Monoid a) => a -> [a] -> a -sep el l = fromMaybe mempty $ - (fromList . fmap (<>el) <$> safe init l) <> safe last l - statList :: Gate -> [Node] -> Maybe Text statList g n = toStr <$> safe tail n where diff --git a/src/Test/VeriFuzz/Internal/Shared.hs b/src/Test/VeriFuzz/Internal/Shared.hs index 584ecfd..84e6af6 100644 --- a/src/Test/VeriFuzz/Internal/Shared.hs +++ b/src/Test/VeriFuzz/Internal/Shared.hs @@ -1,4 +1,14 @@ module Test.VeriFuzz.Internal.Shared where +import Data.Maybe (fromMaybe) + fromList :: (Foldable t, Monoid a) => t a -> a fromList = foldl mappend mempty + +sep :: (Monoid a) => a -> [a] -> a +sep el l = fromMaybe mempty $ + (fromList . fmap (<>el) <$> safe init l) <> safe last l + +safe :: ([a] -> b) -> [a] -> Maybe b +safe _ [] = Nothing +safe f l = Just $ f l -- cgit