From 380b91b8ec012e75d0acffa2635e77afe887d461 Mon Sep 17 00:00:00 2001
From: Yann Herklotz <ymherklotz@gmail.com>
Date: Mon, 31 Dec 2018 12:21:14 +0100
Subject: [Fix #17] Add size to ports

---
 src/Test/VeriFuzz/Verilog/CodeGen.hs | 14 +++++++++++---
 src/Test/VeriFuzz/Verilog/Mutate.hs  |  4 ++--
 2 files changed, 13 insertions(+), 5 deletions(-)

(limited to 'src/Test')

diff --git a/src/Test/VeriFuzz/Verilog/CodeGen.hs b/src/Test/VeriFuzz/Verilog/CodeGen.hs
index e3e6ecf..0122b43 100644
--- a/src/Test/VeriFuzz/Verilog/CodeGen.hs
+++ b/src/Test/VeriFuzz/Verilog/CodeGen.hs
@@ -59,9 +59,12 @@ genModPort port = port ^. portName . getIdentifier
 -- | Generate the 'Port' description.
 genPort :: Port -> Text
 genPort port =
-  t <> name
+  t <> size <> name
   where
     t = (<>" ") . genPortType $ port ^. portType
+    size
+      | port ^. portSize > 1 = "[" <> showT (port ^. portSize - 1) <> ":0] "
+      | otherwise = ""
     name = port ^. portName . getIdentifier
 
 -- | Convert the 'PortDir' type to 'Text'.
@@ -182,8 +185,8 @@ genConstExpr (ConstExpr num) = showT num
 genPortType :: PortType -> Text
 genPortType (PortNet net) = genNet net
 genPortType (Reg signed)
-  | signed = " reg signed "
-  | otherwise = " reg "
+  | signed = "reg signed"
+  | otherwise = "reg"
 
 genAssign :: Text -> Assign -> Text
 genAssign op (Assign r d e) =
@@ -266,3 +269,8 @@ instance Source Description where
 
 instance Source VerilogSrc where
   genSource = genVerilogSrc
+
+newtype SourceShowable a = SrcShow { unSrcShow :: a }
+
+instance (Source a) => Show (SourceShowable a) where
+  show s = T.unpack $ genSource (unSrcShow s)
diff --git a/src/Test/VeriFuzz/Verilog/Mutate.hs b/src/Test/VeriFuzz/Verilog/Mutate.hs
index 258af84..4c032e7 100644
--- a/src/Test/VeriFuzz/Verilog/Mutate.hs
+++ b/src/Test/VeriFuzz/Verilog/Mutate.hs
@@ -82,8 +82,8 @@ nestUpTo i src =
 --
 -- >>> SrcShow $ instantiateMod (ModDecl (Identifier "m") [Port (PortNet Wire) 5 (Identifier "y")] [Port (PortNet Wire) 5 "x"] []) (ModDecl "main" [] [] [])
 -- module main;
--- wire y;
--- reg x;
+-- wire [4:0] y;
+-- reg [4:0] x;
 -- endmodule
 -- <BLANKLINE>
 instantiateMod :: ModDecl -> ModDecl -> ModDecl
-- 
cgit