diff options
author | Yann Herklotz <ymherklotz@gmail.com> | 2018-11-14 11:28:13 +0000 |
---|---|---|
committer | Yann Herklotz <ymherklotz@gmail.com> | 2018-11-14 11:28:13 +0000 |
commit | d455be3b924fea2d42d593a6709557e637e83ad9 (patch) | |
tree | 43229684c2dade70e39a0dfbbc4633d5ec320116 | |
parent | 7d68a1e7ec557e62615a7f9eea438cff7805b120 (diff) | |
download | verismith-d455be3b924fea2d42d593a6709557e637e83ad9.tar.gz verismith-d455be3b924fea2d42d593a6709557e637e83ad9.zip |
Add style to the files
-rw-r--r-- | Setup.hs | 2 | ||||
-rw-r--r-- | examples/simple.v | 2 | ||||
-rw-r--r-- | src/Main.hs | 18 | ||||
-rw-r--r-- | src/Test/VeriFuzz.hs | 6 | ||||
-rw-r--r-- | src/Test/VeriFuzz/CodeGen.hs | 7 | ||||
-rw-r--r-- | src/Test/VeriFuzz/Graph/Random.hs | 10 | ||||
-rw-r--r-- | src/Test/VeriFuzz/Types.hs | 6 |
7 files changed, 25 insertions, 26 deletions
@@ -1,2 +1,2 @@ -import Distribution.Simple +import Distribution.Simple main = defaultMain diff --git a/examples/simple.v b/examples/simple.v index 5198d3d..10b7f0a 100644 --- a/examples/simple.v +++ b/examples/simple.v @@ -3,7 +3,7 @@ module and_comb(in1, in2, out); input in2; output out; - assign out = in1 & in2; + and and1(out, in1, in2); endmodule module main; diff --git a/src/Main.hs b/src/Main.hs index 513b8cc..fd07ef1 100644 --- a/src/Main.hs +++ b/src/Main.hs @@ -1,14 +1,12 @@ module Main where -import Data.GraphViz -import Data.Graph.Inductive -import Data.Graph.Inductive.PatriciaTree -import Data.GraphViz.Attributes.Complete -import Data.GraphViz.Commands -import Data.Text.Lazy -import Data.Text.IO as T +import Data.Graph.Inductive +import Data.GraphViz +import Data.GraphViz.Attributes.Complete +import Data.Text.IO as T +import Data.Text.Lazy -import Test.VeriFuzz +import Test.VeriFuzz instance Labellable Gate where toLabelValue gate = StrLabel . pack $ show gate @@ -16,6 +14,6 @@ instance Labellable Gate where main :: IO () --main = sample (arbitrary :: Gen (Circuit Input)) main = do - gr <- (randomDAG 100 :: IO (Gr Gate ())) - runGraphviz (graphToDot quickParams $ emap (\_ -> "") gr) Png "output.png" + gr <- randomDAG 100 :: IO (Gr Gate ()) + _ <- runGraphviz (graphToDot quickParams $ emap (const "") gr) Png "output.png" T.putStrLn $ generate gr diff --git a/src/Test/VeriFuzz.hs b/src/Test/VeriFuzz.hs index d609a9b..1e49741 100644 --- a/src/Test/VeriFuzz.hs +++ b/src/Test/VeriFuzz.hs @@ -8,6 +8,6 @@ module Test.VeriFuzz , module Test.VeriFuzz.Graph.Random ) where -import Test.VeriFuzz.Types -import Test.VeriFuzz.Graph.Random -import Test.VeriFuzz.CodeGen +import Test.VeriFuzz.CodeGen +import Test.VeriFuzz.Graph.Random +import Test.VeriFuzz.Types diff --git a/src/Test/VeriFuzz/CodeGen.hs b/src/Test/VeriFuzz/CodeGen.hs index 80f813e..d922195 100644 --- a/src/Test/VeriFuzz/CodeGen.hs +++ b/src/Test/VeriFuzz/CodeGen.hs @@ -2,10 +2,9 @@ module Test.VeriFuzz.CodeGen where -import Data.Text (Text, empty, pack) -import Data.Graph.Inductive (Graph, Node, indeg, outdeg, nodes) - -import Test.VeriFuzz.Types +import Data.Graph.Inductive (Graph, Node, indeg, nodes, outdeg) +import Data.Text (Text, empty, pack) +import Test.VeriFuzz.Types fromNode :: Node -> Text fromNode node = pack $ "w" <> show node diff --git a/src/Test/VeriFuzz/Graph/Random.hs b/src/Test/VeriFuzz/Graph/Random.hs index 2b91157..d2d41a8 100644 --- a/src/Test/VeriFuzz/Graph/Random.hs +++ b/src/Test/VeriFuzz/Graph/Random.hs @@ -1,9 +1,11 @@ module Test.VeriFuzz.Graph.Random where -import Data.Graph.Inductive (Graph, LNode, LEdge, mkGraph) -import Test.QuickCheck (Arbitrary, Gen, arbitrary, generate, infiniteListOf, suchThat, listOf, scale, resize) +import Data.Graph.Inductive (Graph, LEdge, LNode, mkGraph) +import Test.QuickCheck (Arbitrary, Gen, arbitrary, generate, + infiniteListOf, listOf, resize, scale, + suchThat) -import Test.VeriFuzz.Types +import Test.VeriFuzz.Types arbitraryEdge :: (Arbitrary e) => Int -> Gen (LEdge e) arbitraryEdge n = do @@ -21,6 +23,6 @@ randomDAG :: (Arbitrary l, Arbitrary e, Graph gr) randomDAG n = do list <- generate . infiniteListOf $ arbitrary l <- generate . infiniteListOf $ arbitraryEdge n - return . mkGraph (nodes list) $ take (2*n) l + return . mkGraph (nodes list) $ take (5*n) l where nodes l = (zip [0..n] $ take n l) diff --git a/src/Test/VeriFuzz/Types.hs b/src/Test/VeriFuzz/Types.hs index 0528972..0e6dea8 100644 --- a/src/Test/VeriFuzz/Types.hs +++ b/src/Test/VeriFuzz/Types.hs @@ -1,14 +1,14 @@ module Test.VeriFuzz.Types where -import Test.QuickCheck -import System.Random +import System.Random +import Test.QuickCheck data Gate = And | Or | Xor | Nor | Nand - deriving (Show, Eq, Enum, Bounded) + deriving (Show, Eq, Enum, Bounded, Ord) instance Random Gate where randomR (a, b) g = |