Add more functions to the code generation

2 files changed, 21 insertions, 25 deletions

diff --git a/src/Test/VeriFuzz/Graph/ASTGen.hs b/src/Test/VeriFuzz/Graph/ASTGen.hs
index 781bbb9..fffb3f8 100644
--- a/src/Test/VeriFuzz/Graph/ASTGen.hs
+++ b/src/Test/VeriFuzz/Graph/ASTGen.hs
@@ -14,36 +14,39 @@ Generates the AST from the graph directly.
 
 module Test.VeriFuzz.Graph.ASTGen where
 
-import qualified Data.Graph.Inductive     as G
-import qualified Data.Text                as T
+import qualified Data.Graph.Inductive       (LNode, Node)
+import qualified Data.Graph.Inductive       as G
+import qualified Data.Text                  as T
 import           Test.VeriFuzz.Circuit
+import           Test.VeriFuzz.Internal.Gen
 import           Test.VeriFuzz.VerilogAST
 
-fromNode :: G.Node -> Identifier
-fromNode node = Identifier . T.pack $ "w" <> show node
+frNode :: Node -> Identifier
+frNode = Identifier . fromNode
 
 fromGate :: Gate -> BinaryOperator
 fromGate And = BinAnd
 fromGate Or  = BinOr
 fromGate Xor = BinXor
 
-filterGr :: (G.Graph gr) => gr n e -> (G.Node -> Bool) -> [G.Node]
-filterGr graph f =
-  filter f $ G.nodes graph
-
 genPortsAST :: Circuit -> [Port]
-genPortsAST c = ((Port Input . fromNode) <$> inp) ++ ((Port Output) . fromNode <$> out)
+genPortsAST c =
+  ((Port Input . frNode) <$> inp) ++ ((Port Output) . frNode <$> out)
   where
-    zero fun1 fun2 n = fun1 graph n == 0 && fun2 graph n /= 0
-    inp = filterGr graph $ zero G.indeg G.outdeg
-    out = filterGr graph $ zero G.outdeg G.indeg
+    inp = inputs graph
+    out = outputs graph
     graph = getCircuit c
 
-genContAssignAST :: Circuit -> G.LNode Gate -> ContAssign
-genContAssignAST c g =
+genAssignExpr :: Gate -> [Node] -> Expression
+genAssignExpr g ns = (error "FIXME: Not yet done")
+
+genContAssignAST :: Circuit -> LNode Gate -> ContAssign
+genContAssignAST c (n, g) =
+  ContAssign name $ genAssignExpr g nodes
   where
     gr = getCircuit c
-    nodes = pre gr $ fst g
+    nodes = G.pre gr n
+    name = frNode n
 
 genAssignAST :: Circuit -> [ContAssign]
 genAssignAST c =
diff --git a/src/Test/VeriFuzz/Graph/CodeGen.hs b/src/Test/VeriFuzz/Graph/CodeGen.hs
index 43fee25..8d20a71 100644
--- a/src/Test/VeriFuzz/Graph/CodeGen.hs
+++ b/src/Test/VeriFuzz/Graph/CodeGen.hs
@@ -21,15 +21,9 @@ import           Data.Graph.Inductive          (Graph, LNode, Node, indeg,
 import           Data.Maybe                    (fromMaybe)
 import           Data.Text                     (Text, empty, pack)
 import           Test.VeriFuzz.Circuit
+import           Test.VeriFuzz.Internal.Gen
 import           Test.VeriFuzz.Internal.Shared
 
-fromNode :: Node -> Text
-fromNode node = pack $ "w" <> show node
-
-filterGr :: (Graph gr) => gr n e -> (Node -> Bool) -> [Node]
-filterGr graph f =
-  filter f $ nodes graph
-
 toOperator :: Gate -> Text
 toOperator And = " & "
 toOperator Or  = " | "
@@ -61,7 +55,6 @@ generate graph =
   <> "$display(\"Hello, world\");\n      $finish;\n    "
   <> "end\nendmodule"
   where
-    zero fun1 fun2 n = fun1 graph n == 0 && fun2 graph n /= 0
-    inp = filterGr graph $ zero indeg outdeg
-    out = filterGr graph $ zero outdeg indeg
+    inp = inputs graph
+    out = outputs graph
     imap b e = fmap ((\s -> b <> s <> e) . fromNode)